summaryrefslogtreecommitdiffstats
path: root/arch/i386/Kconfig
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-08 01:14:20 +0100
committerPaul Mackerras <paulus@samba.org>2005-11-08 01:14:20 +0100
commit24bfb00123e82a2e70bd115277d922438813515b (patch)
tree27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/i386/Kconfig
parentMerge ../linux-2.6 (diff)
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
downloadlinux-24bfb00123e82a2e70bd115277d922438813515b.tar.xz
linux-24bfb00123e82a2e70bd115277d922438813515b.zip
Merge ../linux-2.6
Diffstat (limited to 'arch/i386/Kconfig')
-rw-r--r--arch/i386/Kconfig13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index bac0da731ee3..dbf90ad6eac3 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -997,8 +997,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"