diff options
author | Don Zickus <dzickus@redhat.com> | 2011-01-06 16:18:50 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-01-07 09:08:53 -0500 |
commit | c410b8307702c1e1f35be3fd868ad18e4ba0410f (patch) | |
tree | f81443153309c5d144ec1d163c089cc912c3e201 /arch/x86/kernel/kgdb.c | |
parent | 166d751479c6d4e5b17dfc1f204a9c4397c9b3f1 (diff) |
x86, NMI: Remove DIE_NMI_IPI
With priorities in place and no one really understanding the difference between
DIE_NMI and DIE_NMI_IPI, just remove DIE_NMI_IPI and convert everyone to DIE_NMI.
This also simplifies default_do_nmi() a little bit. Instead of calling the
die_notifier in both the if and else part, just pull it out and call it before
the if-statement. This has the side benefit of avoiding a call to the ioport
to see if there is an external NMI sitting around until after the (more frequent)
internal NMIs are dealt with.
Patch-Inspired-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294348732-15030-5-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/kgdb.c')
-rw-r--r-- | arch/x86/kernel/kgdb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index d43c84183d8f..a4130005028a 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c | |||
@@ -526,10 +526,6 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd) | |||
526 | } | 526 | } |
527 | return NOTIFY_DONE; | 527 | return NOTIFY_DONE; |
528 | 528 | ||
529 | case DIE_NMI_IPI: | ||
530 | /* Just ignore, we will handle the roundup on DIE_NMI. */ | ||
531 | return NOTIFY_DONE; | ||
532 | |||
533 | case DIE_NMIUNKNOWN: | 529 | case DIE_NMIUNKNOWN: |
534 | if (was_in_debug_nmi[raw_smp_processor_id()]) { | 530 | if (was_in_debug_nmi[raw_smp_processor_id()]) { |
535 | was_in_debug_nmi[raw_smp_processor_id()] = 0; | 531 | was_in_debug_nmi[raw_smp_processor_id()] = 0; |