diff options
| author | Don Zickus <dzickus@redhat.com> | 2011-01-06 16:18:50 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-07 15:08:53 +0100 |
| commit | c410b8307702c1e1f35be3fd868ad18e4ba0410f (patch) | |
| tree | f81443153309c5d144ec1d163c089cc912c3e201 /arch/x86/oprofile | |
| parent | 166d751479c6d4e5b17dfc1f204a9c4397c9b3f1 (diff) | |
| download | linux-stable-c410b8307702c1e1f35be3fd868ad18e4ba0410f.tar.gz linux-stable-c410b8307702c1e1f35be3fd868ad18e4ba0410f.tar.bz2 linux-stable-c410b8307702c1e1f35be3fd868ad18e4ba0410f.zip | |
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/oprofile')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 6e84ea42085a..e77ea0b566e0 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -65,7 +65,6 @@ static int profile_exceptions_notify(struct notifier_block *self, switch (val) { case DIE_NMI: - case DIE_NMI_IPI: if (ctr_running) model->check_ctrs(args->regs, &__get_cpu_var(cpu_msrs)); else if (!nmi_enabled) |