x86/ras/inject: Make it depend on X86_LOCAL_APIC=y (d4b2ac63) · Commits · 戴 / test

... and get rid of the annoying: arch/x86/kernel/cpu/mcheck/mce-inject.c:97:13: warning: ‘mce_irq_ipi’ defined but not used [-Wunused-function] when doing randconfig builds. Signed-off-by:

Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Yazen Ghannam <Yazen.Ghannam@amd.com> Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/20170123183514.13356-2-bp@alien8.de Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/x86/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -1070,7 +1070,7 @@ config X86_MCE_THRESHOLD
		def_bool y

		config X86_MCE_INJECT
		depends on X86_MCE
		depends on X86_MCE && X86_LOCAL_APIC
		tristate "Machine check injector support"
		---help---
		Provide support for injecting machine checks for testing purposes.

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -152,7 +152,6 @@ static void raise_mce(struct mce *m)
		if (context == MCJ_CTX_RANDOM)
		return;

		#ifdef CONFIG_X86_LOCAL_APIC
		if (m->inject_flags & (MCJ_IRQ_BROADCAST \| MCJ_NMI_BROADCAST)) {
		unsigned long start;
		int cpu;
		@@ -192,9 +191,7 @@ static void raise_mce(struct mce *m)
		raise_local();
		put_cpu();
		put_online_cpus();
		} else
		#endif
		{
		} else {
		preempt_disable();
		raise_local();
		preempt_enable();

Admin message