tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Robert Richter and committed by
Ingo Molnar 392d65a9 33b07b8b

+7 -19
+1 -1
arch/arm/configs/bcmring_defconfig
··· 11 11 # CONFIG_TIMERFD is not set 12 12 # CONFIG_EVENTFD is not set 13 13 # CONFIG_AIO is not set 14 - CONFIG_PERF_COUNTERS=y 14 + CONFIG_PERF_EVENTS=y 15 15 # CONFIG_VM_EVENT_COUNTERS is not set 16 16 # CONFIG_SLUB_DEBUG is not set 17 17 # CONFIG_COMPAT_BRK is not set
+1 -1
arch/powerpc/configs/chroma_defconfig
··· 32 32 CONFIG_INITRAMFS_COMPRESSION_GZIP=y 33 33 CONFIG_KALLSYMS_ALL=y 34 34 CONFIG_EMBEDDED=y 35 - CONFIG_PERF_COUNTERS=y 35 + CONFIG_PERF_EVENTS=y 36 36 CONFIG_PROFILING=y 37 37 CONFIG_OPROFILE=y 38 38 CONFIG_KPROBES=y
+1 -1
arch/powerpc/configs/gamecube_defconfig
··· 8 8 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 9 9 CONFIG_EXPERT=y 10 10 # CONFIG_ELF_CORE is not set 11 - CONFIG_PERF_COUNTERS=y 11 + CONFIG_PERF_EVENTS=y 12 12 # CONFIG_VM_EVENT_COUNTERS is not set 13 13 CONFIG_SLAB=y 14 14 CONFIG_MODULES=y
+1 -1
arch/powerpc/configs/wii_defconfig
··· 9 9 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 10 CONFIG_EXPERT=y 11 11 # CONFIG_ELF_CORE is not set 12 - CONFIG_PERF_COUNTERS=y 12 + CONFIG_PERF_EVENTS=y 13 13 # CONFIG_VM_EVENT_COUNTERS is not set 14 14 CONFIG_SLAB=y 15 15 CONFIG_MODULES=y
+1 -1
arch/sh/configs/sh7785lcr_32bit_defconfig
··· 5 5 CONFIG_IKCONFIG=y 6 6 CONFIG_IKCONFIG_PROC=y 7 7 CONFIG_LOG_BUF_SHIFT=16 8 - CONFIG_PERF_COUNTERS=y 8 + CONFIG_PERF_EVENTS=y 9 9 # CONFIG_COMPAT_BRK is not set 10 10 CONFIG_SLAB=y 11 11 CONFIG_PROFILING=y
+1 -1
arch/sparc/configs/sparc64_defconfig
··· 5 5 CONFIG_POSIX_MQUEUE=y 6 6 CONFIG_LOG_BUF_SHIFT=18 7 7 CONFIG_BLK_DEV_INITRD=y 8 - CONFIG_PERF_COUNTERS=y 8 + CONFIG_PERF_EVENTS=y 9 9 # CONFIG_COMPAT_BRK is not set 10 10 CONFIG_SLAB=y 11 11 CONFIG_PROFILING=y
+1 -13
init/Kconfig
··· 1156 1156 1157 1157 config PERF_EVENTS 1158 1158 bool "Kernel performance events and counters" 1159 - default y if (PROFILING || PERF_COUNTERS) 1159 + default y if PROFILING 1160 1160 depends on HAVE_PERF_EVENTS 1161 1161 select ANON_INODES 1162 1162 select IRQ_WORK ··· 1182 1182 capabilities on top of those. 1183 1183 1184 1184 Say Y if unsure. 1185 - 1186 - config 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 1185 1198 1186 config DEBUG_PERF_USE_VMALLOC 1199 1187 default n