ARM kprobes: let's enable it

Signed-off-by: Nicolas Pitre <nico@marvell.com>

diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index cb12ae175aa2de80b3114434c20e64cac4857593..53a63890aea49a9def4240e426ddce1db32439c8 100644 (file)
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -141,6 +141,7 @@ architectures:
 - ppc64
 - ia64 (Does not support probes on instruction slot1.)
 - sparc64 (Return probes not yet implemented.)
+- arm
 
 3. Configuring Kprobes
 

diff --git a/arch/arm/Kconfig.instrumentation b/arch/arm/Kconfig.instrumentation
index 63b8c6d5606ad34a6ba799df038e3e886c4e3fd7..453ad8e15d6995ce876683476791dbfd28f8b678 100644 (file)
--- a/arch/arm/Kconfig.instrumentation
+++ b/arch/arm/Kconfig.instrumentation
@@ -43,6 +43,16 @@ config OPROFILE_MPCORE
 config OPROFILE_ARM11_CORE
        bool
 
+config KPROBES
+       bool "Kprobes"
+       depends on KALLSYMS && MODULES && !UML && !XIP_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 MARKERS
        bool "Activate markers"
        help