* [patch 0/5] Instrumentation Menu Removal
@ 2008-02-02 20:10 Mathieu Desnoyers
2008-02-02 20:10 ` [patch 1/5] Fix ARM to play nicely with generic Instrumentation menu Mathieu Desnoyers
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Mathieu Desnoyers @ 2008-02-02 20:10 UTC (permalink / raw)
To: akpm, linux-kernel
Hi Andrew,
Here are the updated instrumentation menu removal patches. They apply on top of
2.6.24-git12. I took tare of the underlying architecture changes that happened
recently (avr32 and arm especially).
Patch order :
# instrumentation menu removal
fix-arm-to-play-nicely-with-generic-instrumentation-menu.patch
create-arch-kconfig.patch
add-have-oprofile.patch
add-have-kprobes.patch
move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch
Mathieu
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch 1/5] Fix ARM to play nicely with generic Instrumentation menu
2008-02-02 20:10 [patch 0/5] Instrumentation Menu Removal Mathieu Desnoyers
@ 2008-02-02 20:10 ` Mathieu Desnoyers
2008-02-02 20:10 ` [patch 2/5] Create arch/Kconfig Mathieu Desnoyers
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Mathieu Desnoyers @ 2008-02-02 20:10 UTC (permalink / raw)
To: akpm, linux-kernel
Cc: Mathieu Desnoyers, Sam Ravnborg, Jeff Dike, David Howells,
Ananth N Mavinakayanahalli, Russell King
[-- Attachment #1: fix-arm-to-play-nicely-with-generic-instrumentation-menu.patch --]
[-- Type: text/plain, Size: 4896 bytes --]
The conflicting commit for
move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch
is the ARM fix from Linus :
commit 38ad9aebe70dc72df08851bbd1620d89329129ba
He just seemed to agree that my approach (just putting the missing ARM
config options in arch/arm/Kconfig) works too. The main advantage it has
is that it is smaller, does not need a cleanup in the future and does
not break the following patches unnecessarily.
It's just been discussed here
http://lkml.org/lkml/2008/1/15/267
However, Linus might prefer to stay with his own patch and I would
totally understand it that late in the release cycle. Therefore I submit
this for the next release cycle.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
CC: Russell King <rmk+lkml@arm.linux.org.uk>
---
arch/arm/Kconfig | 19 +++++++++++
arch/arm/Kconfig.instrumentation | 62 ---------------------------------------
kernel/Kconfig.instrumentation | 4 +-
3 files changed, 20 insertions(+), 65 deletions(-)
Index: linux-2.6-lttng/arch/arm/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig 2008-02-02 14:36:22.000000000 -0500
+++ linux-2.6-lttng/arch/arm/Kconfig 2008-02-02 14:37:00.000000000 -0500
@@ -135,6 +135,23 @@ config FIQ
config ARCH_MTD_XIP
bool
+if OPROFILE
+
+config OPROFILE_ARMV6
+ def_bool y
+ depends on CPU_V6 && !SMP
+ select OPROFILE_ARM11_CORE
+
+config OPROFILE_MPCORE
+ def_bool y
+ depends on CPU_V6 && SMP
+ select OPROFILE_ARM11_CORE
+
+config OPROFILE_ARM11_CORE
+ bool
+
+endif
+
config VECTORS_BASE
hex
default 0xffff0000 if MMU || CPU_HIGH_VECTOR
@@ -1128,7 +1145,7 @@ endmenu
source "fs/Kconfig"
-source "arch/arm/Kconfig.instrumentation"
+source "kernel/Kconfig.instrumentation"
source "arch/arm/Kconfig.debug"
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===================================================================
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2008-02-02 14:36:22.000000000 -0500
+++ linux-2.6-lttng/kernel/Kconfig.instrumentation 2008-02-02 14:37:00.000000000 -0500
@@ -32,7 +32,7 @@ config OPROFILE
config KPROBES
bool "Kprobes"
depends on KALLSYMS && MODULES && !UML
- depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32
+ depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32 || (ARM && !XIP_KERNEL)
help
Kprobes allows you to trap at almost any kernel address and
execute a callback function. register_kprobe() establishes
Index: linux-2.6-lttng/arch/arm/Kconfig.instrumentation
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig.instrumentation 2008-02-02 14:36:22.000000000 -0500
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-menuconfig INSTRUMENTATION
- bool "Instrumentation Support"
- default y
- ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-config PROFILING
- bool "Profiling support (EXPERIMENTAL)"
- help
- Say Y here to enable the extended profiling support mechanisms used
- by profilers such as OProfile.
-
-config OPROFILE
- tristate "OProfile system profiling (EXPERIMENTAL)"
- depends on PROFILING && !UML
- help
- OProfile is a profiling system capable of profiling the
- whole system, include the kernel, kernel modules, libraries,
- and applications.
-
- If unsure, say N.
-
-config OPROFILE_ARMV6
- bool
- depends on OPROFILE && CPU_V6 && !SMP
- default y
- select OPROFILE_ARM11_CORE
-
-config OPROFILE_MPCORE
- bool
- depends on OPROFILE && CPU_V6 && SMP
- default y
- select OPROFILE_ARM11_CORE
-
-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
- Place an empty function call at each marker site. Can be
- dynamically changed for a probe function.
-
-endif # INSTRUMENTATION
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch 2/5] Create arch/Kconfig
2008-02-02 20:10 [patch 0/5] Instrumentation Menu Removal Mathieu Desnoyers
2008-02-02 20:10 ` [patch 1/5] Fix ARM to play nicely with generic Instrumentation menu Mathieu Desnoyers
@ 2008-02-02 20:10 ` Mathieu Desnoyers
2008-02-02 20:10 ` [patch 3/5] Add HAVE_OPROFILE Mathieu Desnoyers
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Mathieu Desnoyers @ 2008-02-02 20:10 UTC (permalink / raw)
To: akpm, linux-kernel
Cc: Mathieu Desnoyers, Sam Ravnborg, Jeff Dike, David Howells,
Ananth N Mavinakayanahalli
[-- Attachment #1: create-arch-kconfig.patch --]
[-- Type: text/plain, Size: 3814 bytes --]
Puts the content of arch/Kconfig in the "General setup" menu.
Linus:
> Should it come with a re-duplication of it's content into each
> architecture, which was the case previously ? The oprofile and kprobes
> menu entries were litteraly cut and pasted from one architecture to
> another. Should we put its content in init/Kconfig then ?
I don't think it's a good idea to go back to making it per-architecture,
although that extensive "depends on <list-of-archiectures-here>" might
indicate that there certainly is room for cleanup there.
And I don't think it's wrong keeping it in kernel/Kconfig.xyz per se, I
just think it's wrong to (a) lump the code together when it really doesn't
necessarily need to and (b) show it to users as some kind of choice that
is tied together (whether it then has common code or not).
On the per-architecture side, I do think it would be better to *not* have
internal architecture knowledge in a generic file, and as such a line like
depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32
really shouldn't exist in a file like kernel/Kconfig.instrumentation.
It would be much better to do
depends on ARCH_SUPPORTS_KPROBES
in that generic file, and then architectures that do support it would just
have a
bool ARCH_SUPPORTS_KPROBES
default y
in *their* architecture files. That would seem to be much more logical,
and is readable both for arch maintainers *and* for people who have no
clue - and don't care - about which architecture is supposed to support
which interface...
Sam Ravnborg:
Stuff it into a new file: arch/Kconfig
We can then extend this file to include all the 'trailing'
Kconfig things that are anyway equal for all ARCHs.
But it should be kept clean - so if we introduce such a file
then we should use ARCH_HAS_whatever in the arch specific Kconfig
files to enable stuff that is not shared.
[...]
The above suggestion is actually not exactly the best way to do it...
First the naming..
A quick grep shows following usage today (in Kconfig files)
ARCH_HAS 51
ARCH_SUPPORTS 4
HAVE_ARCH 7
ARCH_HAS is the clear winner.
In the common Kconfig file do:
config FOO
depends on ARCH_HAS_FOO
bool "bla bla"
config ARCH_HAS_FOO
def_bool n
In the arch specific Kconfig file in a suitable place do:
config SUITABLE_OPTION
select ARCH_HAS_FOO
The naming of ARCH_HAS_ is fixed and shall be:
ARCH_HAS_<config option it will enable>
Only a single line added pr. architecture.
And we will end up with a (maybe even commented) list of trivial selects.
- Yet another update :
Moving to HAVE_* now.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
---
arch/Kconfig | 3 +++
init/Kconfig | 2 ++
2 files changed, 5 insertions(+)
Index: linux-2.6-lttng/init/Kconfig
===================================================================
--- linux-2.6-lttng.orig/init/Kconfig 2008-01-29 15:04:23.000000000 -0500
+++ linux-2.6-lttng/init/Kconfig 2008-01-29 15:22:47.000000000 -0500
@@ -665,6 +665,8 @@ config SLOB
endchoice
+source "arch/Kconfig"
+
endmenu # General setup
config SLABINFO
Index: linux-2.6-lttng/arch/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6-lttng/arch/Kconfig 2008-01-29 15:22:47.000000000 -0500
@@ -0,0 +1,3 @@
+#
+# General architecture dependent options
+#
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch 3/5] Add HAVE_OPROFILE
2008-02-02 20:10 [patch 0/5] Instrumentation Menu Removal Mathieu Desnoyers
2008-02-02 20:10 ` [patch 1/5] Fix ARM to play nicely with generic Instrumentation menu Mathieu Desnoyers
2008-02-02 20:10 ` [patch 2/5] Create arch/Kconfig Mathieu Desnoyers
@ 2008-02-02 20:10 ` Mathieu Desnoyers
2008-02-02 20:10 ` [patch 4/5] Add HAVE_KPROBES Mathieu Desnoyers
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Mathieu Desnoyers @ 2008-02-02 20:10 UTC (permalink / raw)
To: akpm, linux-kernel
Cc: Mathieu Desnoyers, Sam Ravnborg, Haavard Skinnemoen,
David Howells, Jeff Dike, Ananth N Mavinakayanahalli
[-- Attachment #1: add-have-oprofile.patch --]
[-- Type: text/plain, Size: 10393 bytes --]
Linus:
On the per-architecture side, I do think it would be better to *not* have
internal architecture knowledge in a generic file, and as such a line like
depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32
really shouldn't exist in a file like kernel/Kconfig.instrumentation.
It would be much better to do
depends on ARCH_SUPPORTS_KPROBES
in that generic file, and then architectures that do support it would just
have a
bool ARCH_SUPPORTS_KPROBES
default y
in *their* architecture files. That would seem to be much more logical,
and is readable both for arch maintainers *and* for people who have no
clue - and don't care - about which architecture is supposed to support
which interface...
Changelog:
Actually, I know I gave this as the magic incantation, but now that I see
it, I realize that I should have told you to just use
config ARCH_SUPPORTS_KPROBES
def_bool y
instead, which is a bit denser.
We seem to use both kinds of syntax for these things, but this is really
what "def_bool" is there for...
Changelog :
- Moving to HAVE_*.
- Add AVR32 oprofile.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
---
arch/alpha/Kconfig | 1 +
arch/arm/Kconfig | 1 +
arch/avr32/Kconfig | 4 +---
arch/blackfin/Kconfig | 1 +
arch/ia64/Kconfig | 1 +
arch/m32r/Kconfig | 1 +
arch/mips/Kconfig | 1 +
arch/parisc/Kconfig | 1 +
arch/powerpc/Kconfig | 1 +
arch/ppc/Kconfig | 1 +
arch/s390/Kconfig | 1 +
arch/sh/Kconfig | 1 +
arch/sparc/Kconfig | 1 +
arch/sparc64/Kconfig | 1 +
arch/x86/Kconfig | 5 +----
kernel/Kconfig.instrumentation | 5 ++++-
16 files changed, 19 insertions(+), 8 deletions(-)
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===================================================================
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2008-02-02 15:05:46.000000000 -0500
+++ linux-2.6-lttng/kernel/Kconfig.instrumentation 2008-02-02 15:06:13.000000000 -0500
@@ -21,7 +21,7 @@ config PROFILING
config OPROFILE
tristate "OProfile system profiling (EXPERIMENTAL)"
depends on PROFILING && !UML
- depends on ARCH_SUPPORTS_OPROFILE || ALPHA || ARM || BLACKFIN || IA64 || M32R || PARISC || PPC || S390 || SUPERH || SPARC
+ depends on HAVE_OPROFILE
help
OProfile is a profiling system capable of profiling the
whole system, include the kernel, kernel modules, libraries,
@@ -29,6 +29,9 @@ config OPROFILE
If unsure, say N.
+config HAVE_OPROFILE
+ def_bool n
+
config KPROBES
bool "Kprobes"
depends on KALLSYMS && MODULES && !UML
Index: linux-2.6-lttng/arch/alpha/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/alpha/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/alpha/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -5,6 +5,7 @@
config ALPHA
bool
default y
+ select HAVE_OPROFILE
help
The Alpha is a 64-bit general-purpose processor designed and
marketed by the Digital Equipment Corporation of blessed memory,
Index: linux-2.6-lttng/arch/arm/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig 2008-02-02 15:05:46.000000000 -0500
+++ linux-2.6-lttng/arch/arm/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -10,6 +10,7 @@ config ARM
default y
select RTC_LIB
select SYS_SUPPORTS_APM_EMULATION
+ select HAVE_OPROFILE
help
The ARM series is a line of low-power-consumption RISC chip designs
licensed by ARM Ltd and targeted at embedded applications and
Index: linux-2.6-lttng/arch/blackfin/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/blackfin/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/blackfin/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -24,6 +24,7 @@ config RWSEM_XCHGADD_ALGORITHM
config BLACKFIN
bool
default y
+ select HAVE_OPROFILE
config ZONE_DMA
bool
Index: linux-2.6-lttng/arch/ia64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ia64/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/ia64/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -15,6 +15,7 @@ config IA64
select ACPI if (!IA64_HP_SIM)
select PM if (!IA64_HP_SIM)
select ARCH_SUPPORTS_MSI
+ select HAVE_OPROFILE
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
Index: linux-2.6-lttng/arch/m32r/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/m32r/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/m32r/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -8,6 +8,7 @@ mainmenu "Linux/M32R Kernel Configuratio
config M32R
bool
default y
+ select HAVE_OPROFILE
config SBUS
bool
Index: linux-2.6-lttng/arch/mips/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/mips/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/mips/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -1,6 +1,7 @@
config MIPS
bool
default y
+ select HAVE_OPROFILE
# Horrible source of confusion. Die, die, die ...
select EMBEDDED
select RTC_LIB
Index: linux-2.6-lttng/arch/parisc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/parisc/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/parisc/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -7,6 +7,7 @@ mainmenu "Linux/PA-RISC Kernel Configura
config PARISC
def_bool y
+ select HAVE_OPROFILE
help
The PA-RISC microprocessor is designed by Hewlett-Packard and used
in many of their workstations & servers (HP9000 700 and 800 series,
Index: linux-2.6-lttng/arch/powerpc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/powerpc/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/powerpc/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -87,6 +87,7 @@ config ARCH_NO_VIRT_TO_BUS
config PPC
bool
default y
+ select HAVE_OPROFILE
config EARLY_PRINTK
bool
Index: linux-2.6-lttng/arch/ppc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ppc/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/ppc/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -42,6 +42,7 @@ config GENERIC_CALIBRATE_DELAY
config PPC
bool
default y
+ select HAVE_OPROFILE
config PPC32
bool
Index: linux-2.6-lttng/arch/s390/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/s390/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/s390/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -51,6 +51,7 @@ mainmenu "Linux Kernel Configuration"
config S390
def_bool y
+ select HAVE_OPROFILE
source "init/Kconfig"
Index: linux-2.6-lttng/arch/sh/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sh/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/sh/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -8,6 +8,7 @@ mainmenu "Linux/SuperH Kernel Configurat
config SUPERH
def_bool y
select EMBEDDED
+ select HAVE_OPROFILE
help
The SuperH is a RISC processor targeted for use in embedded systems
and consumer electronics; it was also used in the Sega Dreamcast
Index: linux-2.6-lttng/arch/sparc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sparc/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/sparc/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -63,6 +63,7 @@ config NR_CPUS
config SPARC
bool
default y
+ select HAVE_OPROFILE
# Identify this as a Sparc32 build
config SPARC32
Index: linux-2.6-lttng/arch/sparc64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sparc64/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/sparc64/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -8,6 +8,7 @@ mainmenu "Linux/UltraSPARC Kernel Config
config SPARC
bool
default y
+ select HAVE_OPROFILE
config SPARC64
bool
Index: linux-2.6-lttng/arch/x86/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/x86/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/x86/Kconfig 2008-02-02 15:06:13.000000000 -0500
@@ -18,6 +18,7 @@ config X86_64
### Arch settings
config X86
def_bool y
+ select HAVE_OPROFILE
config GENERIC_LOCKBREAK
def_bool n
@@ -106,10 +107,6 @@ config GENERIC_TIME_VSYSCALL
config HAVE_SETUP_PER_CPU_AREA
def_bool X86_64
-config ARCH_SUPPORTS_OPROFILE
- bool
- default y
-
select HAVE_KVM
config ARCH_HIBERNATION_POSSIBLE
Index: linux-2.6-lttng/arch/avr32/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/avr32/Kconfig 2008-02-02 14:55:45.000000000 -0500
+++ linux-2.6-lttng/arch/avr32/Kconfig 2008-02-02 15:06:27.000000000 -0500
@@ -10,6 +10,7 @@ config AVR32
# With EMBEDDED=n, we get lots of stuff automatically selected
# that we usually don't need on AVR32.
select EMBEDDED
+ select HAVE_OPROFILE
help
AVR32 is a high-performance 32-bit RISC microprocessor core,
designed for cost-sensitive embedded applications, with particular
@@ -54,9 +55,6 @@ config ARCH_HAS_ILOG2_U32
config ARCH_HAS_ILOG2_U64
def_bool n
-config ARCH_SUPPORTS_OPROFILE
- def_bool y
-
config GENERIC_HWEIGHT
def_bool y
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch 4/5] Add HAVE_KPROBES
2008-02-02 20:10 [patch 0/5] Instrumentation Menu Removal Mathieu Desnoyers
` (2 preceding siblings ...)
2008-02-02 20:10 ` [patch 3/5] Add HAVE_OPROFILE Mathieu Desnoyers
@ 2008-02-02 20:10 ` Mathieu Desnoyers
2008-02-02 20:10 ` Mathieu Desnoyers
2008-02-02 20:23 ` [patch 0/5] Instrumentation Menu Removal Sam Ravnborg
5 siblings, 0 replies; 8+ messages in thread
From: Mathieu Desnoyers @ 2008-02-02 20:10 UTC (permalink / raw)
To: akpm, linux-kernel
Cc: Mathieu Desnoyers, Sam Ravnborg, Jeff Dike, David Howells,
Ananth N Mavinakayanahalli
[-- Attachment #1: add-have-kprobes.patch --]
[-- Type: text/plain, Size: 6468 bytes --]
Linus:
On the per-architecture side, I do think it would be better to *not* have
internal architecture knowledge in a generic file, and as such a line like
depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32
really shouldn't exist in a file like kernel/Kconfig.instrumentation.
It would be much better to do
depends on ARCH_SUPPORTS_KPROBES
in that generic file, and then architectures that do support it would just
have a
bool ARCH_SUPPORTS_KPROBES
default y
in *their* architecture files. That would seem to be much more logical,
and is readable both for arch maintainers *and* for people who have no
clue - and don't care - about which architecture is supposed to support
which interface...
Changelog:
Actually, I know I gave this as the magic incantation, but now that I see
it, I realize that I should have told you to just use
config KPROBES_SUPPORT
def_bool y
instead, which is a bit denser.
We seem to use both kinds of syntax for these things, but this is really
what "def_bool" is there for...
- Use HAVE_KPROBES
- Use a select
- Yet another update :
Moving to HAVE_* now.
- Update ARM for kprobes support.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
---
arch/arm/Kconfig | 1 +
arch/avr32/Kconfig | 1 +
arch/ia64/Kconfig | 1 +
arch/powerpc/Kconfig | 1 +
arch/ppc/Kconfig | 1 +
arch/s390/Kconfig | 1 +
arch/sparc64/Kconfig | 1 +
arch/x86/Kconfig | 1 +
kernel/Kconfig.instrumentation | 5 ++++-
9 files changed, 12 insertions(+), 1 deletion(-)
Index: linux-2.6-lttng/arch/avr32/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/avr32/Kconfig 2008-02-01 07:37:17.000000000 -0500
+++ linux-2.6-lttng/arch/avr32/Kconfig 2008-02-01 07:37:51.000000000 -0500
@@ -11,6 +11,7 @@ config AVR32
# that we usually don't need on AVR32.
select EMBEDDED
select HAVE_OPROFILE
+ select HAVE_KPROBES
help
AVR32 is a high-performance 32-bit RISC microprocessor core,
designed for cost-sensitive embedded applications, with particular
Index: linux-2.6-lttng/arch/ia64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ia64/Kconfig 2008-02-01 07:37:17.000000000 -0500
+++ linux-2.6-lttng/arch/ia64/Kconfig 2008-02-01 07:39:09.000000000 -0500
@@ -16,6 +16,7 @@ config IA64
select PM if (!IA64_HP_SIM)
select ARCH_SUPPORTS_MSI
select HAVE_OPROFILE
+ select HAVE_KPROBES
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
Index: linux-2.6-lttng/arch/powerpc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/powerpc/Kconfig 2008-02-01 07:37:17.000000000 -0500
+++ linux-2.6-lttng/arch/powerpc/Kconfig 2008-02-01 07:39:09.000000000 -0500
@@ -88,6 +88,7 @@ config PPC
bool
default y
select HAVE_OPROFILE
+ select HAVE_KPROBES
config EARLY_PRINTK
bool
Index: linux-2.6-lttng/arch/ppc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ppc/Kconfig 2008-02-01 07:37:17.000000000 -0500
+++ linux-2.6-lttng/arch/ppc/Kconfig 2008-02-01 07:39:09.000000000 -0500
@@ -43,6 +43,7 @@ config PPC
bool
default y
select HAVE_OPROFILE
+ select HAVE_KPROBES
config PPC32
bool
Index: linux-2.6-lttng/arch/s390/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/s390/Kconfig 2008-02-01 07:37:17.000000000 -0500
+++ linux-2.6-lttng/arch/s390/Kconfig 2008-02-01 07:39:09.000000000 -0500
@@ -52,6 +52,7 @@ mainmenu "Linux Kernel Configuration"
config S390
def_bool y
select HAVE_OPROFILE
+ select HAVE_KPROBES
source "init/Kconfig"
Index: linux-2.6-lttng/arch/sparc64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sparc64/Kconfig 2008-02-01 07:37:17.000000000 -0500
+++ linux-2.6-lttng/arch/sparc64/Kconfig 2008-02-01 07:39:09.000000000 -0500
@@ -9,6 +9,7 @@ config SPARC
bool
default y
select HAVE_OPROFILE
+ select HAVE_KPROBES
config SPARC64
bool
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===================================================================
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2008-02-01 07:37:17.000000000 -0500
+++ linux-2.6-lttng/kernel/Kconfig.instrumentation 2008-02-01 07:39:09.000000000 -0500
@@ -35,7 +35,7 @@ config HAVE_OPROFILE
config KPROBES
bool "Kprobes"
depends on KALLSYMS && MODULES && !UML
- depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32 || (ARM && !XIP_KERNEL)
+ depends on HAVE_KPROBES
help
Kprobes allows you to trap at almost any kernel address and
execute a callback function. register_kprobe() establishes
@@ -43,6 +43,9 @@ config KPROBES
for kernel debugging, non-intrusive instrumentation and testing.
If in doubt, say "N".
+config HAVE_KPROBES
+ def_bool n
+
config MARKERS
bool "Activate markers"
help
Index: linux-2.6-lttng/arch/x86/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/x86/Kconfig 2008-02-01 07:37:47.000000000 -0500
+++ linux-2.6-lttng/arch/x86/Kconfig 2008-02-01 07:39:09.000000000 -0500
@@ -19,6 +19,7 @@ config X86_64
config X86
def_bool y
select HAVE_OPROFILE
+ select HAVE_KPROBES
config GENERIC_LOCKBREAK
def_bool n
Index: linux-2.6-lttng/arch/arm/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig 2008-02-01 07:39:34.000000000 -0500
+++ linux-2.6-lttng/arch/arm/Kconfig 2008-02-01 07:41:06.000000000 -0500
@@ -11,6 +11,7 @@ config ARM
select RTC_LIB
select SYS_SUPPORTS_APM_EMULATION
select HAVE_OPROFILE
+ select HAVE_KPROBES if (!XIP_KERNEL)
help
The ARM series is a line of low-power-consumption RISC chip designs
licensed by ARM Ltd and targeted at embedded applications and
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch 5/5] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
2008-02-02 20:10 [patch 0/5] Instrumentation Menu Removal Mathieu Desnoyers
@ 2008-02-02 20:10 ` Mathieu Desnoyers
2008-02-02 20:10 ` [patch 2/5] Create arch/Kconfig Mathieu Desnoyers
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Mathieu Desnoyers @ 2008-02-02 20:10 UTC (permalink / raw)
To: akpm, linux-kernel
Cc: Mathieu Desnoyers, Linus Torvalds, Sam Ravnborg, linux-arch
[-- Attachment #1: move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch --]
[-- Type: text/plain, Size: 15122 bytes --]
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>
Cc: <linux-arch@vger.kernel.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/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 -----------------------------------------
25 files changed, 40 insertions(+), 99 deletions(-)
Index: linux-2.6-lttng/arch/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/Kconfig 2008-02-02 14:37:03.000000000 -0500
+++ linux-2.6-lttng/arch/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -1,3 +1,31 @@
#
# General architecture dependent options
#
+
+config OPROFILE
+ tristate "OProfile system profiling (EXPERIMENTAL)"
+ depends on PROFILING
+ depends on HAVE_OPROFILE
+ help
+ OProfile is a profiling system capable of profiling the
+ whole system, include the kernel, kernel modules, libraries,
+ and applications.
+
+ If unsure, say N.
+
+config HAVE_OPROFILE
+ def_bool n
+
+config KPROBES
+ bool "Kprobes"
+ depends on KALLSYMS && MODULES
+ depends on HAVE_KPROBES
+ 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 HAVE_KPROBES
+ def_bool n
Index: linux-2.6-lttng/init/Kconfig
===================================================================
--- linux-2.6-lttng.orig/init/Kconfig 2008-02-02 14:37:03.000000000 -0500
+++ linux-2.6-lttng/init/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -665,6 +665,18 @@ config SLOB
endchoice
+config PROFILING
+ bool "Profiling support (EXPERIMENTAL)"
+ help
+ Say Y here to enable the extended profiling support mechanisms used
+ by profilers such as OProfile.
+
+config MARKERS
+ bool "Activate markers"
+ help
+ Place an empty function call at each marker site. Can be
+ dynamically changed for a probe function.
+
source "arch/Kconfig"
endmenu # General setup
Index: linux-2.6-lttng/arch/alpha/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/alpha/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/alpha/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -650,8 +650,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/alpha/Kconfig.debug"
# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
Index: linux-2.6-lttng/arch/arm/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/arm/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -1147,8 +1147,6 @@ endmenu
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/blackfin/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/blackfin/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/blackfin/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -974,8 +974,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/blackfin/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/cris/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/cris/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/cris/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -213,8 +213,6 @@ source "drivers/pci/Kconfig"
source "drivers/usb/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/frv/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/frv/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/frv/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -375,8 +375,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/frv/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/h8300/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/h8300/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/h8300/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -223,8 +223,6 @@ endmenu
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/ia64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ia64/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/ia64/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -602,8 +602,6 @@ config IRQ_PER_CPU
source "arch/ia64/hp/sim/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/m32r/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/m32r/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/m32r/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -427,8 +427,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/m32r/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/m68k/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/m68k/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/m68k/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -678,8 +678,6 @@ endmenu
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/m68knommu/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/m68knommu/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/m68knommu/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -711,8 +711,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/mips/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/mips/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/mips/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -2096,8 +2096,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/parisc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/parisc/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/parisc/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -273,8 +273,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/powerpc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/powerpc/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/powerpc/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -715,8 +715,6 @@ source "arch/powerpc/sysdev/qe_lib/Kconf
source "lib/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/ppc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ppc/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/ppc/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -1258,8 +1258,6 @@ endmenu
source "lib/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/ppc/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/s390/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/s390/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/s390/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -528,8 +528,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/sh/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sh/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/sh/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -897,8 +897,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/sparc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sparc/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/sparc/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -321,8 +321,6 @@ endmenu
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/sparc64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sparc64/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/sparc64/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -467,8 +467,6 @@ source "drivers/sbus/char/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/sparc64/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/um/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/um/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/um/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -289,6 +289,4 @@ config INPUT
bool
default n
-source "kernel/Kconfig.instrumentation"
-
source "arch/um/Kconfig.debug"
Index: linux-2.6-lttng/arch/v850/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/v850/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/v850/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -331,8 +331,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/v850/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/xtensa/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/xtensa/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/xtensa/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -246,8 +246,6 @@ config EMBEDDED_RAMDISK_IMAGE
provide one yourself.
endmenu
-source "kernel/Kconfig.instrumentation"
-
source "arch/xtensa/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/x86/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/x86/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/x86/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -1595,8 +1595,6 @@ source "drivers/firmware/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===================================================================
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2008-02-02 14:37:07.000000000 -0500
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-menuconfig INSTRUMENTATION
- bool "Instrumentation Support"
- default y
- ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-config PROFILING
- bool "Profiling support (EXPERIMENTAL)"
- help
- Say Y here to enable the extended profiling support mechanisms used
- by profilers such as OProfile.
-
-config OPROFILE
- tristate "OProfile system profiling (EXPERIMENTAL)"
- depends on PROFILING && !UML
- depends on HAVE_OPROFILE
- help
- OProfile is a profiling system capable of profiling the
- whole system, include the kernel, kernel modules, libraries,
- and applications.
-
- If unsure, say N.
-
-config HAVE_OPROFILE
- def_bool n
-
-config KPROBES
- bool "Kprobes"
- depends on KALLSYMS && MODULES && !UML
- depends on HAVE_KPROBES
- 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 HAVE_KPROBES
- def_bool n
-
-config MARKERS
- bool "Activate markers"
- help
- Place an empty function call at each marker site. Can be
- dynamically changed for a probe function.
-
-endif # INSTRUMENTATION
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch 5/5] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
@ 2008-02-02 20:10 ` Mathieu Desnoyers
0 siblings, 0 replies; 8+ messages in thread
From: Mathieu Desnoyers @ 2008-02-02 20:10 UTC (permalink / raw)
To: akpm, linux-kernel
Cc: Mathieu Desnoyers, Linus Torvalds, Sam Ravnborg, linux-arch
[-- Attachment #1: move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch --]
[-- Type: text/plain, Size: 15122 bytes --]
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>
Cc: <linux-arch@vger.kernel.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/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 -----------------------------------------
25 files changed, 40 insertions(+), 99 deletions(-)
Index: linux-2.6-lttng/arch/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/Kconfig 2008-02-02 14:37:03.000000000 -0500
+++ linux-2.6-lttng/arch/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -1,3 +1,31 @@
#
# General architecture dependent options
#
+
+config OPROFILE
+ tristate "OProfile system profiling (EXPERIMENTAL)"
+ depends on PROFILING
+ depends on HAVE_OPROFILE
+ help
+ OProfile is a profiling system capable of profiling the
+ whole system, include the kernel, kernel modules, libraries,
+ and applications.
+
+ If unsure, say N.
+
+config HAVE_OPROFILE
+ def_bool n
+
+config KPROBES
+ bool "Kprobes"
+ depends on KALLSYMS && MODULES
+ depends on HAVE_KPROBES
+ 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 HAVE_KPROBES
+ def_bool n
Index: linux-2.6-lttng/init/Kconfig
===================================================================
--- linux-2.6-lttng.orig/init/Kconfig 2008-02-02 14:37:03.000000000 -0500
+++ linux-2.6-lttng/init/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -665,6 +665,18 @@ config SLOB
endchoice
+config PROFILING
+ bool "Profiling support (EXPERIMENTAL)"
+ help
+ Say Y here to enable the extended profiling support mechanisms used
+ by profilers such as OProfile.
+
+config MARKERS
+ bool "Activate markers"
+ help
+ Place an empty function call at each marker site. Can be
+ dynamically changed for a probe function.
+
source "arch/Kconfig"
endmenu # General setup
Index: linux-2.6-lttng/arch/alpha/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/alpha/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/alpha/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -650,8 +650,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/alpha/Kconfig.debug"
# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
Index: linux-2.6-lttng/arch/arm/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/arm/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -1147,8 +1147,6 @@ endmenu
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/blackfin/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/blackfin/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/blackfin/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -974,8 +974,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/blackfin/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/cris/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/cris/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/cris/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -213,8 +213,6 @@ source "drivers/pci/Kconfig"
source "drivers/usb/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/frv/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/frv/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/frv/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -375,8 +375,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/frv/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/h8300/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/h8300/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/h8300/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -223,8 +223,6 @@ endmenu
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/ia64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ia64/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/ia64/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -602,8 +602,6 @@ config IRQ_PER_CPU
source "arch/ia64/hp/sim/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/m32r/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/m32r/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/m32r/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -427,8 +427,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/m32r/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/m68k/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/m68k/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/m68k/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -678,8 +678,6 @@ endmenu
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/m68knommu/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/m68knommu/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/m68knommu/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -711,8 +711,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/mips/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/mips/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/mips/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -2096,8 +2096,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/parisc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/parisc/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/parisc/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -273,8 +273,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/powerpc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/powerpc/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/powerpc/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -715,8 +715,6 @@ source "arch/powerpc/sysdev/qe_lib/Kconf
source "lib/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/ppc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ppc/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/ppc/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -1258,8 +1258,6 @@ endmenu
source "lib/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/ppc/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/s390/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/s390/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/s390/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -528,8 +528,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/sh/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sh/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/sh/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -897,8 +897,6 @@ source "drivers/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/sparc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sparc/Kconfig 2008-02-02 14:37:04.000000000 -0500
+++ linux-2.6-lttng/arch/sparc/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -321,8 +321,6 @@ endmenu
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/sparc64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sparc64/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/sparc64/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -467,8 +467,6 @@ source "drivers/sbus/char/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/sparc64/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/um/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/um/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/um/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -289,6 +289,4 @@ config INPUT
bool
default n
-source "kernel/Kconfig.instrumentation"
-
source "arch/um/Kconfig.debug"
Index: linux-2.6-lttng/arch/v850/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/v850/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/v850/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -331,8 +331,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/v850/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/xtensa/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/xtensa/Kconfig 2008-02-02 14:36:21.000000000 -0500
+++ linux-2.6-lttng/arch/xtensa/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -246,8 +246,6 @@ config EMBEDDED_RAMDISK_IMAGE
provide one yourself.
endmenu
-source "kernel/Kconfig.instrumentation"
-
source "arch/xtensa/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/arch/x86/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/x86/Kconfig 2008-02-02 14:37:07.000000000 -0500
+++ linux-2.6-lttng/arch/x86/Kconfig 2008-02-02 14:37:08.000000000 -0500
@@ -1595,8 +1595,6 @@ source "drivers/firmware/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===================================================================
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2008-02-02 14:37:07.000000000 -0500
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-menuconfig INSTRUMENTATION
- bool "Instrumentation Support"
- default y
- ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-config PROFILING
- bool "Profiling support (EXPERIMENTAL)"
- help
- Say Y here to enable the extended profiling support mechanisms used
- by profilers such as OProfile.
-
-config OPROFILE
- tristate "OProfile system profiling (EXPERIMENTAL)"
- depends on PROFILING && !UML
- depends on HAVE_OPROFILE
- help
- OProfile is a profiling system capable of profiling the
- whole system, include the kernel, kernel modules, libraries,
- and applications.
-
- If unsure, say N.
-
-config HAVE_OPROFILE
- def_bool n
-
-config KPROBES
- bool "Kprobes"
- depends on KALLSYMS && MODULES && !UML
- depends on HAVE_KPROBES
- 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 HAVE_KPROBES
- def_bool n
-
-config MARKERS
- bool "Activate markers"
- help
- Place an empty function call at each marker site. Can be
- dynamically changed for a probe function.
-
-endif # INSTRUMENTATION
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch 0/5] Instrumentation Menu Removal
2008-02-02 20:10 [patch 0/5] Instrumentation Menu Removal Mathieu Desnoyers
` (4 preceding siblings ...)
2008-02-02 20:10 ` Mathieu Desnoyers
@ 2008-02-02 20:23 ` Sam Ravnborg
5 siblings, 0 replies; 8+ messages in thread
From: Sam Ravnborg @ 2008-02-02 20:23 UTC (permalink / raw)
To: Mathieu Desnoyers; +Cc: akpm, linux-kernel
On Sat, Feb 02, 2008 at 03:10:31PM -0500, Mathieu Desnoyers wrote:
> Hi Andrew,
>
> Here are the updated instrumentation menu removal patches. They apply on top of
> 2.6.24-git12. I took tare of the underlying architecture changes that happened
> recently (avr32 and arm especially).
>
> Patch order :
> # instrumentation menu removal
> fix-arm-to-play-nicely-with-generic-instrumentation-menu.patch
> create-arch-kconfig.patch
> add-have-oprofile.patch
> add-have-kprobes.patch
> move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch
I picked this serie up in kbuild.git.
Sam
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-02-02 20:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-02 20:10 [patch 0/5] Instrumentation Menu Removal Mathieu Desnoyers
2008-02-02 20:10 ` [patch 1/5] Fix ARM to play nicely with generic Instrumentation menu Mathieu Desnoyers
2008-02-02 20:10 ` [patch 2/5] Create arch/Kconfig Mathieu Desnoyers
2008-02-02 20:10 ` [patch 3/5] Add HAVE_OPROFILE Mathieu Desnoyers
2008-02-02 20:10 ` [patch 4/5] Add HAVE_KPROBES Mathieu Desnoyers
2008-02-02 20:10 ` [patch 5/5] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig Mathieu Desnoyers
2008-02-02 20:10 ` Mathieu Desnoyers
2008-02-02 20:23 ` [patch 0/5] Instrumentation Menu Removal Sam Ravnborg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.