Re: [patch 02/26] Fix ARM to play nicely with generic Instrumentation menu

[Russell King]

On Thu, Jan 24, 2008 at 03:27:08PM -0500, Mathieu Desnoyers wrote:
> The conflicting commit for 
> move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch
> is the ARM fix from Linus :
> 
> commit 38ad9aebe70dc72df08851bbd1620d89329129ba

Since we have changes which depend on the location of these options,
please hold off until the ARM tree merges in the next window:

----------------------- arch/arm/Kconfig.instrumentation -----------------------
index 63b8c6d..453ad8e 100644
@@ -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


-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/