aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-06 09:20:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-06 09:20:15 +0000
commit43dc78425c12c5c6421e0021d745031b5c247b4c (patch)
tree39de9f431972c40144f4b8045857b26d37adac01 /config
parent75d3a6abb776928172a570a514ce877cfa2dc0eb (diff)
downloadupstream-43dc78425c12c5c6421e0021d745031b5c247b4c.tar.gz
upstream-43dc78425c12c5c6421e0021d745031b5c247b4c.tar.bz2
upstream-43dc78425c12c5c6421e0021d745031b5c247b4c.zip
kernel: fix duplicate KERNEL_PERF_EVENTS with wrong dependency
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 41030
Diffstat (limited to 'config')
-rw-r--r--config/Config-kernel.in5
1 files changed, 1 insertions, 4 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index e64c4b7752..a4a45b4048 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -299,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