Commit cd6b0762 authored by Prasanna S Panchamukhi's avatar Prasanna S Panchamukhi Committed by Linus Torvalds

[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu

Andrew Morton suggested to move kprobes from kernel hacking menu, since
kernel hacking menu is in-appropriate for the Kprobes.  This patch moves
Kprobes and Oprofile under instrumentation menu.

(akpm: it's not a natural fit, but things like djprobes and the s390 guys'
statistics library need a home)
Signed-of-by: default avatarPrasanna S Panchamukhi <prasanna@in.ibm.com>
Cc: Philippe Elie <phil.el@wanadoo.fr>
Cc: John Levon <levon@movementarian.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 78512ece
...@@ -997,8 +997,21 @@ source "drivers/Kconfig" ...@@ -997,8 +997,21 @@ source "drivers/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Instrumentation Support"
depends on EXPERIMENTAL
source "arch/i386/oprofile/Kconfig" source "arch/i386/oprofile/Kconfig"
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
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".
endmenu
source "arch/i386/Kconfig.debug" source "arch/i386/Kconfig.debug"
source "security/Kconfig" source "security/Kconfig"
......
...@@ -22,16 +22,6 @@ config DEBUG_STACKOVERFLOW ...@@ -22,16 +22,6 @@ config DEBUG_STACKOVERFLOW
This option will cause messages to be printed if free stack space This option will cause messages to be printed if free stack space
drops below a certain limit. drops below a certain limit.
config KPROBES
bool "Kprobes"
depends on DEBUG_KERNEL
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 DEBUG_STACK_USAGE config DEBUG_STACK_USAGE
bool "Stack utilization instrumentation" bool "Stack utilization instrumentation"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
......
menu "Profiling support"
depends on EXPERIMENTAL
config PROFILING config PROFILING
bool "Profiling support (EXPERIMENTAL)" bool "Profiling support (EXPERIMENTAL)"
help help
...@@ -19,5 +15,3 @@ config OPROFILE ...@@ -19,5 +15,3 @@ config OPROFILE
If unsure, say N. If unsure, say N.
endmenu
...@@ -426,8 +426,21 @@ config GENERIC_PENDING_IRQ ...@@ -426,8 +426,21 @@ config GENERIC_PENDING_IRQ
source "arch/ia64/hp/sim/Kconfig" source "arch/ia64/hp/sim/Kconfig"
menu "Instrumentation Support"
depends on EXPERIMENTAL
source "arch/ia64/oprofile/Kconfig" source "arch/ia64/oprofile/Kconfig"
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
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".
endmenu
source "arch/ia64/Kconfig.debug" source "arch/ia64/Kconfig.debug"
source "security/Kconfig" source "security/Kconfig"
......
...@@ -2,17 +2,6 @@ menu "Kernel hacking" ...@@ -2,17 +2,6 @@ menu "Kernel hacking"
source "lib/Kconfig.debug" source "lib/Kconfig.debug"
config KPROBES
bool "Kprobes"
depends on DEBUG_KERNEL
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".
choice choice
prompt "Physical memory granularity" prompt "Physical memory granularity"
default IA64_GRANULE_64MB default IA64_GRANULE_64MB
......
menu "Profiling support"
depends on EXPERIMENTAL
config PROFILING config PROFILING
bool "Profiling support (EXPERIMENTAL)" bool "Profiling support (EXPERIMENTAL)"
help help
...@@ -22,5 +18,3 @@ config OPROFILE ...@@ -22,5 +18,3 @@ config OPROFILE
If unsure, say N. If unsure, say N.
endmenu
...@@ -917,8 +917,21 @@ source "arch/powerpc/platforms/iseries/Kconfig" ...@@ -917,8 +917,21 @@ source "arch/powerpc/platforms/iseries/Kconfig"
source "lib/Kconfig" source "lib/Kconfig"
menu "Instrumentation Support"
depends on EXPERIMENTAL
source "arch/powerpc/oprofile/Kconfig" source "arch/powerpc/oprofile/Kconfig"
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
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".
endmenu
source "arch/powerpc/Kconfig.debug" source "arch/powerpc/Kconfig.debug"
source "security/Kconfig" source "security/Kconfig"
......
...@@ -9,16 +9,6 @@ config DEBUG_STACKOVERFLOW ...@@ -9,16 +9,6 @@ config DEBUG_STACKOVERFLOW
This option will cause messages to be printed if free stack space This option will cause messages to be printed if free stack space
drops below a certain limit. drops below a certain limit.
config KPROBES
bool "Kprobes"
depends on DEBUG_KERNEL && PPC64
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 DEBUG_STACK_USAGE config DEBUG_STACK_USAGE
bool "Stack utilization instrumentation" bool "Stack utilization instrumentation"
depends on DEBUG_KERNEL && PPC64 depends on DEBUG_KERNEL && PPC64
......
menu "Profiling support"
depends on EXPERIMENTAL
config PROFILING config PROFILING
bool "Profiling support (EXPERIMENTAL)" bool "Profiling support (EXPERIMENTAL)"
help help
...@@ -19,5 +15,3 @@ config OPROFILE ...@@ -19,5 +15,3 @@ config OPROFILE
If unsure, say N. If unsure, say N.
endmenu
...@@ -377,8 +377,21 @@ source "drivers/fc4/Kconfig" ...@@ -377,8 +377,21 @@ source "drivers/fc4/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Instrumentation Support"
depends on EXPERIMENTAL
source "arch/sparc64/oprofile/Kconfig" source "arch/sparc64/oprofile/Kconfig"
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
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".
endmenu
source "arch/sparc64/Kconfig.debug" source "arch/sparc64/Kconfig.debug"
source "security/Kconfig" source "security/Kconfig"
......
...@@ -11,16 +11,6 @@ config DEBUG_STACK_USAGE ...@@ -11,16 +11,6 @@ config DEBUG_STACK_USAGE
This option will slow down process creation somewhat. This option will slow down process creation somewhat.
config KPROBES
bool "Kprobes"
depends on DEBUG_KERNEL
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 DEBUG_DCFLUSH config DEBUG_DCFLUSH
bool "D-cache flush debugging" bool "D-cache flush debugging"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
......
menu "Profiling support"
depends on EXPERIMENTAL
config PROFILING config PROFILING
bool "Profiling support (EXPERIMENTAL)" bool "Profiling support (EXPERIMENTAL)"
help help
...@@ -19,5 +15,3 @@ config OPROFILE ...@@ -19,5 +15,3 @@ config OPROFILE
If unsure, say N. If unsure, say N.
endmenu
...@@ -532,8 +532,21 @@ source "drivers/firmware/Kconfig" ...@@ -532,8 +532,21 @@ source "drivers/firmware/Kconfig"
source fs/Kconfig source fs/Kconfig
menu "Instrumentation Support"
depends on EXPERIMENTAL
source "arch/x86_64/oprofile/Kconfig" source "arch/x86_64/oprofile/Kconfig"
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
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".
endmenu
source "arch/x86_64/Kconfig.debug" source "arch/x86_64/Kconfig.debug"
source "security/Kconfig" source "security/Kconfig"
......
...@@ -33,16 +33,6 @@ config IOMMU_DEBUG ...@@ -33,16 +33,6 @@ config IOMMU_DEBUG
options. See Documentation/x86_64/boot-options.txt for more options. See Documentation/x86_64/boot-options.txt for more
details. details.
config KPROBES
bool "Kprobes"
depends on DEBUG_KERNEL
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 IOMMU_LEAK config IOMMU_LEAK
bool "IOMMU leak tracing" bool "IOMMU leak tracing"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
......
menu "Profiling support"
depends on EXPERIMENTAL
config PROFILING config PROFILING
bool "Profiling support (EXPERIMENTAL)" bool "Profiling support (EXPERIMENTAL)"
help help
...@@ -19,5 +15,3 @@ config OPROFILE ...@@ -19,5 +15,3 @@ config OPROFILE
If unsure, say N. If unsure, say N.
endmenu
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment