[patch 03/26] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

Previous thread: [patch 07/26] Add INIT_ARRAY() to kernel.h by Mathieu Desnoyers on Thursday, January 24, 2008 - 4:27 pm. (14 messages)

Next thread: [patch 14/26] Immediate Values - Architecture Independent Code by Mathieu Desnoyers on Thursday, January 24, 2008 - 4:27 pm. (1 message)
To: <akpm@...>, Ingo Molnar <mingo@...>, <linux-kernel@...>
Cc: Mathieu Desnoyers <mathieu.desnoyers@...>, Linus Torvalds <torvalds@...>, Sam Ravnborg <sam@...>
Date: Thursday, January 24, 2008 - 4:27 pm

Move the instrumentation Kconfig to

arch/Kconfig for architecture dependent options
- oprofile
- kprobes

and

init/Kconfig for architecture independent options
- profiling
- markers

Remove the "Instrumentation Support" menu. Everything moves to "General setup".
Delete the kernel/Kconfig.instrumentation file.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Sam Ravnborg <sam@ravnborg.org>
---
arch/Kconfig | 28 ++++++++++++++++++++
arch/alpha/Kconfig | 2 -
arch/arm/Kconfig | 2 -
arch/blackfin/Kconfig | 2 -
arch/cris/Kconfig | 2 -
arch/frv/Kconfig | 2 -
arch/h8300/Kconfig | 2 -
arch/ia64/Kconfig | 2 -
arch/m32r/Kconfig | 2 -
arch/m68k/Kconfig | 2 -
arch/m68knommu/Kconfig | 2 -
arch/mips/Kconfig | 2 -
arch/parisc/Kconfig | 2 -
arch/powerpc/Kconfig | 2 -
arch/ppc/Kconfig | 2 -
arch/s390/Kconfig | 2 -
arch/sh/Kconfig | 2 -
arch/sh64/Kconfig | 2 -
arch/sparc/Kconfig | 2 -
arch/sparc64/Kconfig | 2 -
arch/um/Kconfig | 2 -
arch/v850/Kconfig | 2 -
arch/x86/Kconfig | 2 -
arch/xtensa/Kconfig | 2 -
init/Kconfig | 12 ++++++++
kernel/Kconfig.instrumentation | 55 -----------------------------------------
26 files changed, 40 insertions(+), 101 deletions(-)

Index: linux-2.6-lttng.mm/arch/Kconfig
===================================================================
--- linux-2.6-lttng.mm.orig/arch/Kconfig 2008-01-24 14:10:37.000000000 -0500
+++ linux-2.6-lttng.mm/arch/Kconfig 2008-01-24 14:20:06.000000000 -0500
@@ -1,3 +1,31 @@
#
# General architecture dependent opt...

To: Mathieu Desnoyers <mathieu.desnoyers@...>
Cc: <akpm@...>, Ingo Molnar <mingo@...>, <linux-kernel@...>, Mathieu Desnoyers <mathieu.desnoyers@...>, Linus Torvalds <torvalds@...>, Sam Ravnborg <sam@...>
Date: Thursday, January 24, 2008 - 7:05 pm

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
--

To: <akpm@...>, Ingo Molnar <mingo@...>, <linux-kernel@...>
Cc: Linus Torvalds <torvalds@...>, Sam Ravnborg <sam@...>
Date: Thursday, January 24, 2008 - 6:03 pm

Please wait for updated version. Waiting for the next ARM merge adding

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
--

To: Mathieu Desnoyers <mathieu.desnoyers@...>
Cc: <akpm@...>, Ingo Molnar <mingo@...>, <linux-kernel@...>, Linus Torvalds <torvalds@...>, Sam Ravnborg <sam@...>
Date: Thursday, January 24, 2008 - 5:00 pm

Was this done based on a suggestion from someone (Linus)?

---
~Randy
--

To: Randy Dunlap <randy.dunlap@...>
Cc: <akpm@...>, Ingo Molnar <mingo@...>, <linux-kernel@...>, Linus Torvalds <torvalds@...>, Sam Ravnborg <sam@...>
Date: Thursday, January 24, 2008 - 5:05 pm

Yes, it was Linus'suggestion. I prefer the instrumentation menu too, but
in order to be consistent, we would have to create an instrumentation/
directory in the kernel tree.

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
--

Previous thread: [patch 07/26] Add INIT_ARRAY() to kernel.h by Mathieu Desnoyers on Thursday, January 24, 2008 - 4:27 pm. (14 messages)

Next thread: [patch 14/26] Immediate Values - Architecture Independent Code by Mathieu Desnoyers on Thursday, January 24, 2008 - 4:27 pm. (1 message)