Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c410b830 authored by Don Zickus's avatar Don Zickus Committed by Ingo Molnar
Browse files

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: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294348732-15030-5-git-send-email-dzickus@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 166d7514

arch/x86/include/asm/kdebug.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ enum die_val { 
	DIE_TRAP,

	DIE_GPF,

	DIE_CALL,

	DIE_NMI_IPI,

	DIE_PAGE_FAULT,

	DIE_NMIUNKNOWN,

};

arch/x86/kernel/apic/hw_nmi.c

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self, 


	switch (cmd) {

	case DIE_NMI:

	case DIE_NMI_IPI:

		break;



	default:

arch/x86/kernel/cpu/mcheck/mce-inject.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/gfp.h>

#include <asm/mce.h>

#include <asm/apic.h>

#include <asm/nmi.h>



/* Update fake mce registers on current CPU. */

static void inject_mce(struct mce *m)
@@ -83,7 +84,7 @@ static int mce_raise_notify(struct notifier_block *self, 
	struct die_args *args = (struct die_args *)data;

	int cpu = smp_processor_id();

	struct mce *m = &__get_cpu_var(injectm);

	if (val != DIE_NMI_IPI || !cpumask_test_cpu(cpu, mce_inject_cpumask))

	if (val != DIE_NMI || !cpumask_test_cpu(cpu, mce_inject_cpumask))

		return NOTIFY_DONE;

	cpumask_clear_cpu(cpu, mce_inject_cpumask);

	if (m->inject_flags & MCJ_EXCEPTION)

arch/x86/kernel/cpu/perf_event.c

+0 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,6 @@ perf_event_nmi_handler(struct notifier_block *self, 


	switch (cmd) {

	case DIE_NMI:

	case DIE_NMI_IPI:

		break;

	case DIE_NMIUNKNOWN:

		this_nmi = percpu_read(irq_stat.__nmi_count);

arch/x86/kernel/kgdb.c

+0 −4
Original line number Diff line number Diff line
@@ -526,10 +526,6 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd) 
		}

		return NOTIFY_DONE;



	case DIE_NMI_IPI:

		/* Just ignore, we will handle the roundup on DIE_NMI. */

		return NOTIFY_DONE;



	case DIE_NMIUNKNOWN:

		if (was_in_debug_nmi[raw_smp_processor_id()]) {

			was_in_debug_nmi[raw_smp_processor_id()] = 0;