aboutsummaryrefslogtreecommitdiffstats
path: root/init
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 /init
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 'init')
-rw-r--r--init/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index e44e25422f2..ab733c32292 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -943,8 +943,7 @@ config PERF_USE_VMALLOC
See tools/perf/design.txt for details
config PERF_EVENTS_NMI
- bool
- depends on PERF_EVENTS
+ def_bool PERF_EVENTS && HAVE_PERF_EVENTS_NMI
help
System hardware can generate an NMI using the perf event
subsystem. Also has support for calculating CPU cycle events