diff options
Diffstat (limited to 'arch/mips/kernel/kgdb.c')
| -rw-r--r-- | arch/mips/kernel/kgdb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c index c5a8b2d21ca4..8f6d58ede33c 100644 --- a/arch/mips/kernel/kgdb.c +++ b/arch/mips/kernel/kgdb.c | |||
| @@ -62,13 +62,13 @@ void arch_kgdb_breakpoint(void) | |||
| 62 | 62 | ||
| 63 | static void kgdb_call_nmi_hook(void *ignored) | 63 | static void kgdb_call_nmi_hook(void *ignored) |
| 64 | { | 64 | { |
| 65 | kgdb_nmicallback(raw_smp_processor_id(), (void *)0); | 65 | kgdb_nmicallback(raw_smp_processor_id(), NULL); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | void kgdb_roundup_cpus(unsigned long flags) | 68 | void kgdb_roundup_cpus(unsigned long flags) |
| 69 | { | 69 | { |
| 70 | local_irq_enable(); | 70 | local_irq_enable(); |
| 71 | smp_call_function(kgdb_call_nmi_hook, NULL, NULL); | 71 | smp_call_function(kgdb_call_nmi_hook, NULL, 0); |
| 72 | local_irq_disable(); | 72 | local_irq_disable(); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| @@ -190,9 +190,6 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd, | |||
| 190 | struct pt_regs *regs = args->regs; | 190 | struct pt_regs *regs = args->regs; |
| 191 | int trap = (regs->cp0_cause & 0x7c) >> 2; | 191 | int trap = (regs->cp0_cause & 0x7c) >> 2; |
| 192 | 192 | ||
| 193 | if (fixup_exception(regs)) | ||
| 194 | return NOTIFY_DONE; | ||
| 195 | |||
| 196 | /* Userpace events, ignore. */ | 193 | /* Userpace events, ignore. */ |
| 197 | if (user_mode(regs)) | 194 | if (user_mode(regs)) |
| 198 | return NOTIFY_DONE; | 195 | return NOTIFY_DONE; |
