From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 6 Jun 2014 09:20:15 +0000 (+0000)
Subject: kernel: fix duplicate KERNEL_PERF_EVENTS with wrong dependency
X-Git-Tag: v14.07~838
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=9eb585ddab591e329260266a497be55eddbc4b6a;hp=551bf8f6971db6dd057645f1e415718bdd1d2eb4;p=openwrt-github%2F.git

kernel: fix duplicate KERNEL_PERF_EVENTS with wrong dependency

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41030 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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