From: Prasanna S Panchamukhi 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. Signed-of-by: Prasanna S Panchamukhi Cc: Philippe Elie Cc: John Levon Signed-off-by: Andrew Morton --- arch/i386/Kconfig | 13 +++++++++++++ arch/i386/Kconfig.debug | 10 ---------- arch/i386/oprofile/Kconfig | 6 ------ arch/ia64/Kconfig | 13 +++++++++++++ arch/ia64/Kconfig.debug | 11 ----------- arch/ia64/oprofile/Kconfig | 6 ------ arch/ppc64/Kconfig | 13 +++++++++++++ arch/ppc64/Kconfig.debug | 10 ---------- arch/ppc64/oprofile/Kconfig | 6 ------ arch/sparc64/Kconfig | 13 +++++++++++++ arch/sparc64/Kconfig.debug | 10 ---------- arch/sparc64/oprofile/Kconfig | 6 ------ arch/x86_64/Kconfig | 13 +++++++++++++ arch/x86_64/Kconfig.debug | 10 ---------- arch/x86_64/oprofile/Kconfig | 6 ------ 15 files changed, 65 insertions(+), 81 deletions(-) diff -puN arch/i386/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/i386/Kconfig --- devel/arch/i386/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/i386/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -1304,8 +1304,21 @@ source "drivers/Kconfig" source "fs/Kconfig" +menu "Instrumentation Support" + depends on EXPERIMENTAL + 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 "security/Kconfig" diff -puN arch/i386/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/i386/Kconfig.debug --- devel/arch/i386/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/i386/Kconfig.debug 2005-10-11 00:34:46.000000000 -0700 @@ -22,16 +22,6 @@ config DEBUG_STACKOVERFLOW This option will cause messages to be printed if free stack space 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 bool "Stack utilization instrumentation" depends on DEBUG_KERNEL diff -puN arch/i386/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/i386/oprofile/Kconfig --- devel/arch/i386/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/i386/oprofile/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -1,7 +1,3 @@ - -menu "Profiling support" - depends on EXPERIMENTAL - config PROFILING bool "Profiling support (EXPERIMENTAL)" help @@ -19,5 +15,3 @@ config OPROFILE If unsure, say N. -endmenu - diff -puN arch/ia64/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/ia64/Kconfig --- devel/arch/ia64/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/ia64/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -426,8 +426,21 @@ config GENERIC_PENDING_IRQ source "arch/ia64/hp/sim/Kconfig" +menu "Instrumentation Support" + depends on EXPERIMENTAL + 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 "security/Kconfig" diff -puN arch/ia64/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/ia64/Kconfig.debug --- devel/arch/ia64/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/ia64/Kconfig.debug 2005-10-11 00:34:46.000000000 -0700 @@ -2,17 +2,6 @@ menu "Kernel hacking" 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 prompt "Physical memory granularity" default IA64_GRANULE_64MB diff -puN arch/ia64/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/ia64/oprofile/Kconfig --- devel/arch/ia64/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/ia64/oprofile/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -1,7 +1,3 @@ - -menu "Profiling support" - depends on EXPERIMENTAL - config PROFILING bool "Profiling support (EXPERIMENTAL)" help @@ -22,5 +18,3 @@ config OPROFILE If unsure, say N. -endmenu - diff -puN arch/ppc64/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/ppc64/Kconfig --- devel/arch/ppc64/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/ppc64/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -461,8 +461,21 @@ config VIOPATH depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || VETH default y +menu "Instrumentation Support" + depends on EXPERIMENTAL + source "arch/ppc64/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/ppc64/Kconfig.debug" source "security/Kconfig" diff -puN arch/ppc64/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/ppc64/Kconfig.debug --- devel/arch/ppc64/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/ppc64/Kconfig.debug 2005-10-11 00:34:46.000000000 -0700 @@ -9,16 +9,6 @@ config DEBUG_STACKOVERFLOW This option will cause messages to be printed if free stack space 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 bool "Stack utilization instrumentation" depends on DEBUG_KERNEL diff -puN arch/ppc64/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/ppc64/oprofile/Kconfig --- devel/arch/ppc64/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/ppc64/oprofile/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -1,7 +1,3 @@ - -menu "Profiling support" - depends on EXPERIMENTAL - config PROFILING bool "Profiling support (EXPERIMENTAL)" help @@ -19,5 +15,3 @@ config OPROFILE If unsure, say N. -endmenu - diff -puN arch/sparc64/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/sparc64/Kconfig --- devel/arch/sparc64/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/sparc64/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -377,8 +377,21 @@ source "drivers/fc4/Kconfig" source "fs/Kconfig" +menu "Instrumentation Support" + depends on EXPERIMENTAL + 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 "security/Kconfig" diff -puN arch/sparc64/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/sparc64/Kconfig.debug --- devel/arch/sparc64/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/sparc64/Kconfig.debug 2005-10-11 00:34:46.000000000 -0700 @@ -11,16 +11,6 @@ config DEBUG_STACK_USAGE 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 bool "D-cache flush debugging" depends on DEBUG_KERNEL diff -puN arch/sparc64/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/sparc64/oprofile/Kconfig --- devel/arch/sparc64/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/sparc64/oprofile/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -1,7 +1,3 @@ - -menu "Profiling support" - depends on EXPERIMENTAL - config PROFILING bool "Profiling support (EXPERIMENTAL)" help @@ -19,5 +15,3 @@ config OPROFILE If unsure, say N. -endmenu - diff -puN arch/x86_64/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/x86_64/Kconfig --- devel/arch/x86_64/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/x86_64/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -551,8 +551,21 @@ source "drivers/firmware/Kconfig" source fs/Kconfig +menu "Instrumentation Support" + depends on EXPERIMENTAL + 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 "security/Kconfig" diff -puN arch/x86_64/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/x86_64/Kconfig.debug --- devel/arch/x86_64/Kconfig.debug~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/x86_64/Kconfig.debug 2005-10-11 00:34:46.000000000 -0700 @@ -33,16 +33,6 @@ config IOMMU_DEBUG options. See Documentation/x86_64/boot-options.txt for more 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 bool "IOMMU leak tracing" depends on DEBUG_KERNEL diff -puN arch/x86_64/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu arch/x86_64/oprofile/Kconfig --- devel/arch/x86_64/oprofile/Kconfig~moving-kprobes-and-oprofile-to-instrumentation-support-menu 2005-10-11 00:34:46.000000000 -0700 +++ devel-akpm/arch/x86_64/oprofile/Kconfig 2005-10-11 00:34:46.000000000 -0700 @@ -1,7 +1,3 @@ - -menu "Profiling support" - depends on EXPERIMENTAL - config PROFILING bool "Profiling support (EXPERIMENTAL)" help @@ -19,5 +15,3 @@ config OPROFILE If unsure, say N. -endmenu - _