Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
Move the instrumentation Kconfig to arch/Kconfig for architecture dependent options - oprofile - kprobes and init/Kconfig for architecture independent options - profiling - markers Remove the "Instrumentation Support" menu. Everything moves to "General setup". Delete the kernel/Kconfig.instrumentation file. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
parent
3f550096de
commit
125e564582
arch
Kconfig
alpha
arm
blackfin
cris
frv
h8300
ia64
m32r
m68k
m68knommu
mips
parisc
powerpc
ppc
s390
sh
sparc
sparc64
um
v850
x86
xtensa
init
kernel
28
arch/Kconfig
28
arch/Kconfig
|
@ -1,3 +1,31 @@
|
||||||
#
|
#
|
||||||
# General architecture dependent options
|
# General architecture dependent options
|
||||||
#
|
#
|
||||||
|
|
||||||
|
config OPROFILE
|
||||||
|
tristate "OProfile system profiling (EXPERIMENTAL)"
|
||||||
|
depends on PROFILING
|
||||||
|
depends on HAVE_OPROFILE
|
||||||
|
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 HAVE_OPROFILE
|
||||||
|
def_bool n
|
||||||
|
|
||||||
|
config KPROBES
|
||||||
|
bool "Kprobes"
|
||||||
|
depends on KALLSYMS && MODULES
|
||||||
|
depends on HAVE_KPROBES
|
||||||
|
help
|
||||||
|
Kprobes allows you to trap at almost any kernel address and
|
||||||
|
execute a callback function. register_kprobe() establishes
|
||||||
|
a probepoint and specifies the callback. Kprobes is useful
|
||||||
|
for kernel debugging, non-intrusive instrumentation and testing.
|
||||||
|
If in doubt, say "N".
|
||||||
|
|
||||||
|
config HAVE_KPROBES
|
||||||
|
def_bool n
|
||||||
|
|
|
@ -650,8 +650,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/alpha/Kconfig.debug"
|
source "arch/alpha/Kconfig.debug"
|
||||||
|
|
||||||
# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
|
# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
|
||||||
|
|
|
@ -1147,8 +1147,6 @@ endmenu
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/arm/Kconfig.debug"
|
source "arch/arm/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -974,8 +974,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/blackfin/Kconfig.debug"
|
source "arch/blackfin/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -213,8 +213,6 @@ source "drivers/pci/Kconfig"
|
||||||
|
|
||||||
source "drivers/usb/Kconfig"
|
source "drivers/usb/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/cris/Kconfig.debug"
|
source "arch/cris/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -375,8 +375,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/frv/Kconfig.debug"
|
source "arch/frv/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -223,8 +223,6 @@ endmenu
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/h8300/Kconfig.debug"
|
source "arch/h8300/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -602,8 +602,6 @@ config IRQ_PER_CPU
|
||||||
|
|
||||||
source "arch/ia64/hp/sim/Kconfig"
|
source "arch/ia64/hp/sim/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/ia64/Kconfig.debug"
|
source "arch/ia64/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -427,8 +427,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/m32r/Kconfig.debug"
|
source "arch/m32r/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -678,8 +678,6 @@ endmenu
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/m68k/Kconfig.debug"
|
source "arch/m68k/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -711,8 +711,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/m68knommu/Kconfig.debug"
|
source "arch/m68knommu/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -2096,8 +2096,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/mips/Kconfig.debug"
|
source "arch/mips/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -273,8 +273,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/parisc/Kconfig.debug"
|
source "arch/parisc/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -715,8 +715,6 @@ source "arch/powerpc/sysdev/qe_lib/Kconfig"
|
||||||
|
|
||||||
source "lib/Kconfig"
|
source "lib/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/powerpc/Kconfig.debug"
|
source "arch/powerpc/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -1258,8 +1258,6 @@ endmenu
|
||||||
|
|
||||||
source "lib/Kconfig"
|
source "lib/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/ppc/Kconfig.debug"
|
source "arch/ppc/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -528,8 +528,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/s390/Kconfig.debug"
|
source "arch/s390/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -897,8 +897,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/sh/Kconfig.debug"
|
source "arch/sh/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -321,8 +321,6 @@ endmenu
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/sparc/Kconfig.debug"
|
source "arch/sparc/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -467,8 +467,6 @@ source "drivers/sbus/char/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/sparc64/Kconfig.debug"
|
source "arch/sparc64/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -289,6 +289,4 @@ config INPUT
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/um/Kconfig.debug"
|
source "arch/um/Kconfig.debug"
|
||||||
|
|
|
@ -331,8 +331,6 @@ source "sound/Kconfig"
|
||||||
|
|
||||||
source "drivers/usb/Kconfig"
|
source "drivers/usb/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/v850/Kconfig.debug"
|
source "arch/v850/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -1595,8 +1595,6 @@ source "drivers/firmware/Kconfig"
|
||||||
|
|
||||||
source "fs/Kconfig"
|
source "fs/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/x86/Kconfig.debug"
|
source "arch/x86/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -246,8 +246,6 @@ config EMBEDDED_RAMDISK_IMAGE
|
||||||
provide one yourself.
|
provide one yourself.
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
source "kernel/Kconfig.instrumentation"
|
|
||||||
|
|
||||||
source "arch/xtensa/Kconfig.debug"
|
source "arch/xtensa/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
12
init/Kconfig
12
init/Kconfig
|
@ -665,6 +665,18 @@ config SLOB
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
config PROFILING
|
||||||
|
bool "Profiling support (EXPERIMENTAL)"
|
||||||
|
help
|
||||||
|
Say Y here to enable the extended profiling support mechanisms used
|
||||||
|
by profilers such as OProfile.
|
||||||
|
|
||||||
|
config MARKERS
|
||||||
|
bool "Activate markers"
|
||||||
|
help
|
||||||
|
Place an empty function call at each marker site. Can be
|
||||||
|
dynamically changed for a probe function.
|
||||||
|
|
||||||
source "arch/Kconfig"
|
source "arch/Kconfig"
|
||||||
|
|
||||||
endmenu # General setup
|
endmenu # General setup
|
||||||
|
|
|
@ -1,55 +0,0 @@
|
||||||
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
|
|
||||||
depends on HAVE_OPROFILE
|
|
||||||
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 HAVE_OPROFILE
|
|
||||||
def_bool n
|
|
||||||
|
|
||||||
config KPROBES
|
|
||||||
bool "Kprobes"
|
|
||||||
depends on KALLSYMS && MODULES && !UML
|
|
||||||
depends on HAVE_KPROBES
|
|
||||||
help
|
|
||||||
Kprobes allows you to trap at almost any kernel address and
|
|
||||||
execute a callback function. register_kprobe() establishes
|
|
||||||
a probepoint and specifies the callback. Kprobes is useful
|
|
||||||
for kernel debugging, non-intrusive instrumentation and testing.
|
|
||||||
If in doubt, say "N".
|
|
||||||
|
|
||||||
config HAVE_KPROBES
|
|
||||||
def_bool n
|
|
||||||
|
|
||||||
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