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 ARCH_HAS_KPROBES
- Use a select
Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
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.i386 | 1 +
arch/x86/Kconfig.x86_64 | 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 2007-11-14 17:03:05.000000000
-0500
+++ linux-2.6-lttng/arch/avr32/Kconfig 2007-11-14 17:11:33.000000000 -0500
@@ -11,6 +11,7 @@ config AVR32
# With EMBEDDED=n, we get lots of stuff automatically selected
# that we usually don't need on AVR32.
select EMBEDDED
+ select ARCH_HAS_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 2007-11-14 17:05:38.000000000
-0500
+++ linux-2.6-lttng/arch/ia64/Kconfig 2007-11-14 17:11:45.000000000 -0500
@@ -16,6 +16,7 @@ config IA64
select PM if (!IA64_HP_SIM)
select ARCH_SUPPORTS_MSI
select ARCH_HAS_OPROFILE
+ select ARCH_HAS_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 2007-11-14 17:07:13.000000000
-0500
+++ linux-2.6-lttng/arch/powerpc/Kconfig 2007-11-14 17:11:59.000000000
-0500
@@ -80,6 +80,7 @@ config PPC
bool
default y
select ARCH_HAS_OPROFILE
+ select ARCH_HAS_KPROBES
config EARLY_PRINTK
bool
Index: linux-2.6-lttng/arch/ppc/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/ppc/Kconfig 2007-11-14 17:07:55.000000000
-0500
+++ linux-2.6-lttng/arch/ppc/Kconfig 2007-11-14 17:12:08.000000000 -0500
@@ -43,6 +43,7 @@ config PPC
bool
default y
select ARCH_HAS_OPROFILE
+ select ARCH_HAS_KPROBES
config PPC32
bool
Index: linux-2.6-lttng/arch/s390/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/s390/Kconfig 2007-11-14 17:08:15.000000000
-0500
+++ linux-2.6-lttng/arch/s390/Kconfig 2007-11-14 17:12:19.000000000 -0500
@@ -52,6 +52,7 @@ mainmenu "Linux Kernel Configuration"
config S390
def_bool y
select ARCH_HAS_OPROFILE
+ select ARCH_HAS_KPROBES
source "init/Kconfig"
Index: linux-2.6-lttng/arch/sparc64/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/sparc64/Kconfig 2007-11-14 17:09:07.000000000
-0500
+++ linux-2.6-lttng/arch/sparc64/Kconfig 2007-11-14 17:12:27.000000000
-0500
@@ -9,6 +9,7 @@ config SPARC
bool
default y
select ARCH_HAS_OPROFILE
+ select ARCH_HAS_KPROBES
config SPARC64
bool
Index: linux-2.6-lttng/arch/x86/Kconfig.i386
===================================================================
--- linux-2.6-lttng.orig/arch/x86/Kconfig.i386 2007-11-14 17:09:16.000000000
-0500
+++ linux-2.6-lttng/arch/x86/Kconfig.i386 2007-11-14 17:12:34.000000000
-0500
@@ -9,6 +9,7 @@ config X86_32
bool
default y
select ARCH_HAS_OPROFILE
+ select ARCH_HAS_KPROBES
help
This is Linux's home port. Linux was originally native to the Intel
386, and runs on all the later x86 processors including the Intel
Index: linux-2.6-lttng/arch/x86/Kconfig.x86_64
===================================================================
--- linux-2.6-lttng.orig/arch/x86/Kconfig.x86_64 2007-11-14
17:09:22.000000000 -0500
+++ linux-2.6-lttng/arch/x86/Kconfig.x86_64 2007-11-14 17:12:41.000000000
-0500
@@ -13,6 +13,7 @@ config X86_64
bool
default y
select ARCH_HAS_OPROFILE
+ select ARCH_HAS_KPROBES
help
Port to the x86-64 architecture. x86-64 is a 64-bit extension to the
classical 32-bit x86 architecture. For details see
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===================================================================
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-14
17:09:56.000000000 -0500
+++ linux-2.6-lttng/kernel/Kconfig.instrumentation 2007-11-14
17:12:48.000000000 -0500
@@ -35,7 +35,7 @@ config ARCH_HAS_OPROFILE
config KPROBES
bool "Kprobes"
depends on KALLSYMS && MODULES
- depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32
+ depends on ARCH_HAS_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 ARCH_HAS_KPROBES
+ def_bool n
+
config MARKERS
bool "Activate markers"
help
--
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 unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
