aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2010-05-15 22:57:48 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2010-05-16 01:57:36 +0200
commitc01d4323309a90a298fd81cf3a059ee1b12be2e9 (patch)
treed34c6508c56d14cf1461528c1840182a348f26f4 /arch
parente16bb1d7fe07609bc8b0e4c043eff2f47ada78d8 (diff)
downloadmrst-s0i3-test-c01d4323309a90a298fd81cf3a059ee1b12be2e9.tar.gz
mrst-s0i3-test-c01d4323309a90a298fd81cf3a059ee1b12be2e9.tar.xz
mrst-s0i3-test-c01d4323309a90a298fd81cf3a059ee1b12be2e9.zip
lockup_detector: Adapt CONFIG_PERF_EVENT_NMI to other archs
CONFIG_PERF_EVENT_NMI is something that need to be enabled from the arch. This is fine on x86 as PERF_EVENTS is builtin but if other archs select it, they will need to handle the PERF_EVENTS dependency. Instead, handle the dependency in the generic layer: - archs need to tell what they support through HAVE_PERF_EVENTS_NMI - Enable magically PERF_EVENTS_NMI if we have PERF_EVENTS and HAVE_PERF_EVENTS_NMI. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Don Zickus <dzickus@redhat.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/Kconfig3
-rw-r--r--arch/x86/Kconfig2
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index e5eb1337a53..89b0efb5094 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -145,4 +145,7 @@ config HAVE_HW_BREAKPOINT
config HAVE_USER_RETURN_NOTIFIER
bool
+config HAVE_PERF_EVENTS_NMI
+ bool
+
source "kernel/gcov/Kconfig"
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3cb28cd1f55..3cb5bb02172 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -54,7 +54,7 @@ config X86
select HAVE_KERNEL_LZO
select HAVE_HW_BREAKPOINT
select PERF_EVENTS
- select PERF_EVENTS_NMI
+ select HAVE_PERF_EVENTS_NMI
select ANON_INODES
select HAVE_ARCH_KMEMCHECK
select HAVE_USER_RETURN_NOTIFIER