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

Configure Feed

Select the types of activity you want to include in your feed.

Fix ARM profiling/instrumentation configuration

Commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 ("Combine
instrumentation menus in kernel/Kconfig.instrumentation") broke ARM
profiling support, since ARM has some extra Kconfig options and doesn't
just use the common OPROFILE/KPROBES config options.

Rather than just revert the thing outright, or add ARM-specific
knowledge to the generic Kconfig.instrumentation file (where the only
and whole point was to be generic, not too architecture-specific), this
just makes ARM not use the generic version, since it doesn't suit it.

So create an arm-specific version of Kconfig.instrumentation instead,
and use that.

Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Linus Torvalds 38ad9aeb 3568834e

+53 -1
+1 -1
arch/arm/Kconfig
··· 1076 1076 1077 1077 source "fs/Kconfig" 1078 1078 1079 - source "kernel/Kconfig.instrumentation" 1079 + source "arch/arm/Kconfig.instrumentation" 1080 1080 1081 1081 source "arch/arm/Kconfig.debug" 1082 1082
+52
arch/arm/Kconfig.instrumentation
··· 1 + menuconfig INSTRUMENTATION 2 + bool "Instrumentation Support" 3 + default y 4 + ---help--- 5 + Say Y here to get to see options related to performance measurement, 6 + system-wide debugging, and testing. This option alone does not add any 7 + kernel code. 8 + 9 + If you say N, all options in this submenu will be skipped and 10 + disabled. If you're trying to debug the kernel itself, go see the 11 + Kernel Hacking menu. 12 + 13 + if INSTRUMENTATION 14 + 15 + config PROFILING 16 + bool "Profiling support (EXPERIMENTAL)" 17 + help 18 + Say Y here to enable the extended profiling support mechanisms used 19 + by profilers such as OProfile. 20 + 21 + config OPROFILE 22 + tristate "OProfile system profiling (EXPERIMENTAL)" 23 + depends on PROFILING && !UML 24 + help 25 + OProfile is a profiling system capable of profiling the 26 + whole system, include the kernel, kernel modules, libraries, 27 + and applications. 28 + 29 + If unsure, say N. 30 + 31 + config OPROFILE_ARMV6 32 + bool 33 + depends on OPROFILE && CPU_V6 && !SMP 34 + default y 35 + select OPROFILE_ARM11_CORE 36 + 37 + config OPROFILE_MPCORE 38 + bool 39 + depends on OPROFILE && CPU_V6 && SMP 40 + default y 41 + select OPROFILE_ARM11_CORE 42 + 43 + config OPROFILE_ARM11_CORE 44 + bool 45 + 46 + config MARKERS 47 + bool "Activate markers" 48 + help 49 + Place an empty function call at each marker site. Can be 50 + dynamically changed for a probe function. 51 + 52 + endif # INSTRUMENTATION