kernel: fix duplicate KERNEL_PERF_EVENTS with wrong dependency

[openwrt/svn-archive/archive.git] / config / Config-kernel.in

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 543b638f65157ed31ae88ab3e4011403506d4f4a..a4a45b4048c86c41b651c8e12ba9eadcc8c53b20 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -134,6 +134,17 @@ config KERNEL_PRINTK_TIME
        bool "Enable printk timestamps"
        default y
 
+config KERNEL_SLUB_DEBUG
+       bool
+
+config KERNEL_SLUB_DEBUG_ON
+       bool
+
+config KERNEL_SLABINFO
+       select KERNEL_SLUB_DEBUG
+       select KERNEL_SLUB_DEBUG_ON
+       bool "Enable /proc slab debug info"
+
 config KERNEL_PROC_PAGE_MONITOR
        bool "Enable /proc page monitoring"
 
@@ -288,12 +299,9 @@ if KERNEL_CGROUPS
                  the kmem extension can use it to guarantee that no group of processes
                  will ever exhaust kernel resources alone.
 
-       config KERNEL_PERF_EVENTS
-               bool
-               default y if KERNEL_CGROUP_PERF
-
        config KERNEL_CGROUP_PERF
                bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
+               select KERNEL_PERF_EVENTS
                default n
                help
                  This option extends the per-cpu mode to restrict monitoring to