lockup_detector: Combine nmi_watchdog and softlockup detector

[karo-tx-linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 089a230e565271c960f952cb279ac43571fb99f3..e44e25422f22d01b774637773c403132d85e0048 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -463,6 +463,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
 
 menuconfig CGROUPS
        boolean "Control Group support"
+       depends on EVENTFD
        help
          This option adds support for grouping sets of processes together, for
          use with process control subsystems such as Cpusets, CFS, memory
@@ -941,6 +942,14 @@ config PERF_USE_VMALLOC
        help
          See tools/perf/design.txt for details
 
+config PERF_EVENTS_NMI
+       bool
+       depends on PERF_EVENTS
+       help
+         System hardware can generate an NMI using the perf event
+         subsystem.  Also has support for calculating CPU cycle events
+         to determine how many clock cycles in a given period.
+
 menu "Kernel Performance Events And Counters"
 
 config PERF_EVENTS