From: Prasanna S Panchamukhi <prasanna@in.ibm.com>
This patch modifies the return value of kprobes exceptions notify handler.
The kprobes exception notifier returns NOTIFY_STOP on handling
notification. This patch helps other debuggers to co-exists with the
Kprobes. Other debuggers registered for exceptions notification must
return NOTIFY_STOP on handling the notification.
Signed-Off-By : Prasanna S Panchamukhi <prasanna@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/i386/kernel/traps.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/i386/kernel/traps.c~kprobes-exception-notifier-fix-kgdb-i386 arch/i386/kernel/traps.c
--- 25/arch/i386/kernel/traps.c~kprobes-exception-notifier-fix-kgdb-i386 2004-10-03 16:42:23.616862632 -0700
+++ 25-akpm/arch/i386/kernel/traps.c 2004-10-03 16:42:23.620862024 -0700
@@ -468,7 +468,7 @@ asmlinkage void do_##name(struct pt_regs
{ \
CHK_REMOTE_DEBUG(trapnr,signr,error_code,regs,) \
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
- == NOTIFY_OK) \
+ == NOTIFY_STOP) \
return; \
do_trap(trapnr, signr, str, 0, regs, error_code, NULL); \
}
@@ -482,7 +482,7 @@ asmlinkage void do_##name(struct pt_regs
info.si_code = sicode; \
info.si_addr = (void __user *)siaddr; \
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
- == NOTIFY_BAD) \
+ == NOTIFY_STOP) \
return; \
do_trap(trapnr, signr, str, 0, regs, error_code, &info); \
}
@@ -492,7 +492,7 @@ asmlinkage void do_##name(struct pt_regs
{ \
CHK_REMOTE_DEBUG(trapnr, signr, error_code,regs, return) \
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
- == NOTIFY_OK) \
+ == NOTIFY_STOP) \
return; \
do_trap(trapnr, signr, str, 1, regs, error_code, NULL); \
}
_