diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2008-03-07 17:34:16 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 14:05:40 -0400 |
commit | 737a460f21febe551ff1d2299b63bae9b154078f (patch) | |
tree | 7a2d9440222c22446e283f6fbc959b4a44270989 /arch/x86/kernel/traps_64.c | |
parent | 84b5ae15216aa3ea0314f395536ef9829af21e14 (diff) |
kgdb: fix several kgdb regressions
kgdb core fixes:
- Check to see that mm->mmap_cache is not null before calling
flush_cache_range(), else on arch=ARM it will cause a fatal
fault.
- Breakpoints should only be restored if they are in the BP_ACTIVE
state.
- Fix a typo in comments to "kgdb_register_io_module"
x86 kgdb fixes:
- Fix the x86 arch handler such that on a kill or detach that the
appropriate cleanup on the single stepping flags gets run.
- Add in the DIE_NMIWATCHDOG call for x86_64
- Touch the nmi watchdog before returning the system to normal
operation after performing any kind of kgdb operation, else
the possibility exists to trigger the watchdog.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/traps_64.c')
-rw-r--r-- | arch/x86/kernel/traps_64.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index 055b1650c69d..4e073320e70a 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -600,8 +600,13 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
600 | 600 | ||
601 | void __kprobes die_nmi(char *str, struct pt_regs *regs, int do_panic) | 601 | void __kprobes die_nmi(char *str, struct pt_regs *regs, int do_panic) |
602 | { | 602 | { |
603 | unsigned long flags = oops_begin(); | 603 | unsigned long flags; |
604 | |||
605 | if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == | ||
606 | NOTIFY_STOP) | ||
607 | return; | ||
604 | 608 | ||
609 | flags = oops_begin(); | ||
605 | /* | 610 | /* |
606 | * We are in trouble anyway, lets at least try | 611 | * We are in trouble anyway, lets at least try |
607 | * to get a message out. | 612 | * to get a message out. |