diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 14:23:21 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 14:23:21 -0800 |
commit | 92af254a1b7ea8c09ddff83887e5edc1342b37f8 (patch) | |
tree | 1a390e67b4b047cb706bd26f6e9c52670153c3ac /arch/ia64/kernel/kprobes.c | |
parent | f747307ed1defcdfd37a3ef84c48e3138691cd26 (diff) | |
parent | 5a94bcfd2a18edcf368b3128c7df07b58e529932 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/kprobes.c')
-rw-r--r-- | arch/ia64/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index 801eeaeaf3d..2895d6e6062 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c @@ -740,7 +740,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, switch(val) { case DIE_BREAK: /* err is break number from ia64_bad_break() */ - if (args->err == 0x80200 || args->err == 0x80300) + if (args->err == 0x80200 || args->err == 0x80300 || args->err == 0) if (pre_kprobes_handler(args)) ret = NOTIFY_STOP; break; |