aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2012-04-05 12:24:44 -0400
committerIngo Molnar <mingo@kernel.org>2012-04-26 07:52:52 -0400
commit392d65a9adbe2f09707d2de27110dafb9c8dc08b (patch)
tree413412af5991cbc6489ecaca5e615bedbd3d0b41 /init
parent33b07b8be7f0e1e8e4184e3473d71f174e4b0641 (diff)
perf: Remove PERF_COUNTERS config option
Renaming remaining PERF_COUNTERS options into PERF_EVENTS. Think we can get rid of PERF_COUNTERS now. Signed-off-by: Robert Richter <robert.richter@amd.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1333643084-26776-5-git-send-email-robert.richter@amd.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig14
1 files changed, 1 insertions, 13 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 6cfd71d06463..7e3713519b0e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1156,7 +1156,7 @@ menu "Kernel Performance Events And Counters"
1156 1156
1157config PERF_EVENTS 1157config PERF_EVENTS
1158 bool "Kernel performance events and counters" 1158 bool "Kernel performance events and counters"
1159 default y if (PROFILING || PERF_COUNTERS) 1159 default y if PROFILING
1160 depends on HAVE_PERF_EVENTS 1160 depends on HAVE_PERF_EVENTS
1161 select ANON_INODES 1161 select ANON_INODES
1162 select IRQ_WORK 1162 select IRQ_WORK
@@ -1183,18 +1183,6 @@ config PERF_EVENTS
1183 1183
1184 Say Y if unsure. 1184 Say Y if unsure.
1185 1185
1186config PERF_COUNTERS
1187 bool "Kernel performance counters (old config option)"
1188 depends on HAVE_PERF_EVENTS
1189 help
1190 This config has been obsoleted by the PERF_EVENTS
1191 config option - please see that one for details.
1192
1193 It has no effect on the kernel whether you enable
1194 it or not, it is a compatibility placeholder.
1195
1196 Say N if unsure.
1197
1198config DEBUG_PERF_USE_VMALLOC 1186config DEBUG_PERF_USE_VMALLOC
1199 default n 1187 default n
1200 bool "Debug: use vmalloc to back perf mmap() buffers" 1188 bool "Debug: use vmalloc to back perf mmap() buffers"