summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2011-12-07 16:06:30 -0500
committerIngo Molnar <mingo@elte.hu>2011-12-07 23:26:55 +0100
commit4f941c57fe7e04e38c2401d53516bfd16038c9ab (patch)
tree8d9a87a5ed3d218439b5a50bdcd11563088ef4f5
parentd2db6610219cbcadceea6c43ee03d89068b7d759 (diff)
downloadblackbird-op-linux-4f941c57fe7e04e38c2401d53516bfd16038c9ab.tar.gz
blackbird-op-linux-4f941c57fe7e04e38c2401d53516bfd16038c9ab.zip
x86, NMI: NMI selftest depends on the local apic
The selftest doesn't work with out a local apic for now. Reported-by: Randy Durlap <rdunlap@xenotime.net> Signed-off-by: Don Zickus <dzickus@redhat.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Link: http://lkml.kernel.org/r/20111207210630.GI1669@redhat.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/Kconfig.debug2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 97da3c17b424..aa4158f3ce62 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -289,7 +289,7 @@ config DEBUG_STRICT_USER_COPY_CHECKS
config DEBUG_NMI_SELFTEST
bool "NMI Selftest"
- depends on DEBUG_KERNEL
+ depends on DEBUG_KERNEL && X86_LOCAL_APIC
---help---
Enabling this option turns on a quick NMI selftest to verify
that the NMI behaves correctly.
OpenPOWER on IntegriCloud