From 43dc78425c12c5c6421e0021d745031b5c247b4c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 6 Jun 2014 09:20:15 +0000 Subject: [PATCH] kernel: fix duplicate KERNEL_PERF_EVENTS with wrong dependency Signed-off-by: Felix Fietkau SVN-Revision: 41030 --- config/Config-kernel.in | 5 +---- 1 file changed, 1 insertion(+), 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