Commit d4b2ac63 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar

x86/ras/inject: Make it depend on X86_LOCAL_APIC=y

... 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: default avatarBorislav 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.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a4685d2f
...@@ -1070,7 +1070,7 @@ config X86_MCE_THRESHOLD ...@@ -1070,7 +1070,7 @@ config X86_MCE_THRESHOLD
def_bool y def_bool y
config X86_MCE_INJECT config X86_MCE_INJECT
depends on X86_MCE depends on X86_MCE && X86_LOCAL_APIC
tristate "Machine check injector support" tristate "Machine check injector support"
---help--- ---help---
Provide support for injecting machine checks for testing purposes. Provide support for injecting machine checks for testing purposes.
......
...@@ -152,7 +152,6 @@ static void raise_mce(struct mce *m) ...@@ -152,7 +152,6 @@ static void raise_mce(struct mce *m)
if (context == MCJ_CTX_RANDOM) if (context == MCJ_CTX_RANDOM)
return; return;
#ifdef CONFIG_X86_LOCAL_APIC
if (m->inject_flags & (MCJ_IRQ_BROADCAST | MCJ_NMI_BROADCAST)) { if (m->inject_flags & (MCJ_IRQ_BROADCAST | MCJ_NMI_BROADCAST)) {
unsigned long start; unsigned long start;
int cpu; int cpu;
...@@ -192,9 +191,7 @@ static void raise_mce(struct mce *m) ...@@ -192,9 +191,7 @@ static void raise_mce(struct mce *m)
raise_local(); raise_local();
put_cpu(); put_cpu();
put_online_cpus(); put_online_cpus();
} else } else {
#endif
{
preempt_disable(); preempt_disable();
raise_local(); raise_local();
preempt_enable(); preempt_enable();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment