On Thu, 24 Jan 2008 15:27:09 -0500 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> wrote:Hmm. In preparation for oprofile, I currently have the below in my avr32 tree (i.e. -mm). What's the best way to deal with that? I intend to push this early once the merge window opens. Could you just remove the instrumentation menu from avr32 as well in your patch? It should still apply nicely to -mm. Haavard commit 5ad893c907a645def629bbdab3a1c114f619bf1c Author: Haavard Skinnemoen <hskinnemoen@atmel.com> Date: Wed Oct 31 15:22:34 2007 +0100 [AVR32] Include instrumentation menu Remove KPROBES option from Kconfig.debug and include kernel/Kconfig.instrumentation. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index b77abce..bc08c7f 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -219,6 +219,8 @@ source "drivers/Kconfig" source "fs/Kconfig" +source "kernel/Kconfig.instrumentation" + source "arch/avr32/Kconfig.debug" source "security/Kconfig" diff --git a/arch/avr32/Kconfig.debug b/arch/avr32/Kconfig.debug index 64ace00..2283933 100644 --- a/arch/avr32/Kconfig.debug +++ b/arch/avr32/Kconfig.debug @@ -6,14 +6,4 @@ config TRACE_IRQFLAGS_SUPPORT 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". - endmenu --
| Jan Engelhardt | intel iommu (Re: -mm merge plans for 2.6.23) |
| Justin C. Sherrill | Re: dragonflybsd.org website link? |
| Greg Kroah-Hartman | [PATCH 002/196] Chinese: rephrase English introduction in HOWTO |
| Tarkan Erimer | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
git: | |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
| David Miller | [GIT]: Networking |
| Patrick McHardy | [NET_SCHED 01/15]: sch_atm: fix format string warning |
