forked from luck/tmp_suning_uos_patched
Fix ARM profiling/instrumentation configuration
Commit 09cadedbdc
("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>
This commit is contained in:
parent
3568834e81
commit
38ad9aebe7
|
@ -1076,7 +1076,7 @@ endmenu
|
|||
|
||||
source "fs/Kconfig"
|
||||
|
||||
source "kernel/Kconfig.instrumentation"
|
||||
source "arch/arm/Kconfig.instrumentation"
|
||||
|
||||
source "arch/arm/Kconfig.debug"
|
||||
|
||||
|
|
52
arch/arm/Kconfig.instrumentation
Normal file
52
arch/arm/Kconfig.instrumentation
Normal file
|
@ -0,0 +1,52 @@
|
|||
menuconfig INSTRUMENTATION
|
||||
bool "Instrumentation Support"
|
||||
default y
|
||||
---help---
|
||||
Say Y here to get to see options related to performance measurement,
|
||||
system-wide debugging, and testing. This option alone does not add any
|
||||
kernel code.
|
||||
|
||||
If you say N, all options in this submenu will be skipped and
|
||||
disabled. If you're trying to debug the kernel itself, go see the
|
||||
Kernel Hacking menu.
|
||||
|
||||
if INSTRUMENTATION
|
||||
|
||||
config PROFILING
|
||||
bool "Profiling support (EXPERIMENTAL)"
|
||||
help
|
||||
Say Y here to enable the extended profiling support mechanisms used
|
||||
by profilers such as OProfile.
|
||||
|
||||
config OPROFILE
|
||||
tristate "OProfile system profiling (EXPERIMENTAL)"
|
||||
depends on PROFILING && !UML
|
||||
help
|
||||
OProfile is a profiling system capable of profiling the
|
||||
whole system, include the kernel, kernel modules, libraries,
|
||||
and applications.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config OPROFILE_ARMV6
|
||||
bool
|
||||
depends on OPROFILE && CPU_V6 && !SMP
|
||||
default y
|
||||
select OPROFILE_ARM11_CORE
|
||||
|
||||
config OPROFILE_MPCORE
|
||||
bool
|
||||
depends on OPROFILE && CPU_V6 && SMP
|
||||
default y
|
||||
select OPROFILE_ARM11_CORE
|
||||
|
||||
config OPROFILE_ARM11_CORE
|
||||
bool
|
||||
|
||||
config MARKERS
|
||||
bool "Activate markers"
|
||||
help
|
||||
Place an empty function call at each marker site. Can be
|
||||
dynamically changed for a probe function.
|
||||
|
||||
endif # INSTRUMENTATION
|
Loading…
Reference in New Issue
Block a user