The patch titled Add ARCH_SUPPORTS_KPROBES has been added to the -mm tree. Its filename is add-arch_supports_kprobes.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Add ARCH_SUPPORTS_KPROBES From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> 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... Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Cc: <linux-arch@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/avr32/Kconfig | 3 +++ arch/ia64/Kconfig | 3 +++ arch/powerpc/Kconfig | 3 +++ arch/ppc/Kconfig | 3 +++ arch/s390/Kconfig | 3 +++ arch/sparc64/Kconfig | 3 +++ arch/x86/Kconfig | 3 +++ kernel/Kconfig.instrumentation | 2 +- 8 files changed, 22 insertions(+), 1 deletion(-) diff -puN arch/avr32/Kconfig~add-arch_supports_kprobes arch/avr32/Kconfig --- a/arch/avr32/Kconfig~add-arch_supports_kprobes +++ a/arch/avr32/Kconfig @@ -67,6 +67,9 @@ config GENERIC_BUG default y depends on BUG +config ARCH_SUPPORTS_KPROBES + def_bool y + source "init/Kconfig" menu "System Type and features" diff -puN arch/ia64/Kconfig~add-arch_supports_kprobes arch/ia64/Kconfig --- a/arch/ia64/Kconfig~add-arch_supports_kprobes +++ a/arch/ia64/Kconfig @@ -102,6 +102,9 @@ config AUDIT_ARCH config ARCH_SUPPORTS_OPROFILE def_bool y +config ARCH_SUPPORTS_KPROBES + def_bool y + choice prompt "System type" default IA64_GENERIC diff -puN arch/powerpc/Kconfig~add-arch_supports_kprobes arch/powerpc/Kconfig --- a/arch/powerpc/Kconfig~add-arch_supports_kprobes +++ a/arch/powerpc/Kconfig @@ -166,6 +166,9 @@ config PPC_OF_PLATFORM_PCI config ARCH_SUPPORTS_OPROFILE def_bool y +config ARCH_SUPPORTS_KPROBES + def_bool y + source "init/Kconfig" source "arch/powerpc/platforms/Kconfig" diff -puN arch/ppc/Kconfig~add-arch_supports_kprobes arch/ppc/Kconfig --- a/arch/ppc/Kconfig~add-arch_supports_kprobes +++ a/arch/ppc/Kconfig @@ -72,6 +72,9 @@ config GENERIC_BUG config ARCH_SUPPORTS_OPROFILE def_bool y +config ARCH_SUPPORTS_KPROBES + def_bool y + source "init/Kconfig" menu "Processor" diff -puN arch/s390/Kconfig~add-arch_supports_kprobes arch/s390/Kconfig --- a/arch/s390/Kconfig~add-arch_supports_kprobes +++ a/arch/s390/Kconfig @@ -55,6 +55,9 @@ config S390 config ARCH_SUPPORTS_OPROFILE def_bool y +config ARCH_SUPPORTS_KPROBES + def_bool y + source "init/Kconfig" menu "Base setup" diff -puN arch/sparc64/Kconfig~add-arch_supports_kprobes arch/sparc64/Kconfig --- a/arch/sparc64/Kconfig~add-arch_supports_kprobes +++ a/arch/sparc64/Kconfig @@ -79,6 +79,9 @@ config GENERIC_HARDIRQS_NO__DO_IRQ config ARCH_SUPPORTS_OPROFILE def_bool y +config ARCH_SUPPORTS_KPROBES + def_bool y + choice prompt "Kernel page size" default SPARC64_PAGE_SIZE_8KB diff -puN arch/x86/Kconfig~add-arch_supports_kprobes arch/x86/Kconfig --- a/arch/x86/Kconfig~add-arch_supports_kprobes +++ a/arch/x86/Kconfig @@ -175,6 +175,9 @@ config KTIME_SCALAR config ARCH_SUPPORTS_OPROFILE def_bool y +config ARCH_SUPPORTS_KPROBES + def_bool y + source "init/Kconfig" menu "Processor type and features" diff -puN kernel/Kconfig.instrumentation~add-arch_supports_kprobes kernel/Kconfig.instrumentation --- a/kernel/Kconfig.instrumentation~add-arch_supports_kprobes +++ a/kernel/Kconfig.instrumentation @@ -32,7 +32,7 @@ config OPROFILE config KPROBES bool "Kprobes" depends on KALLSYMS && MODULES - depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32 + depends on ARCH_SUPPORTS_KPROBES help Kprobes allows you to trap at almost any kernel address and execute a callback function. register_kprobe() establishes _ Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are origin.patch add-cmpxchg_local-to-asm-generic-for-per-cpu-atomic-operations.patch fall-back-on-interrupt-disable-in-cmpxchg8b-on-80386-and-80486.patch add-cmpxchg64-and-cmpxchg64_local-to-alpha.patch add-cmpxchg64-and-cmpxchg64_local-to-mips.patch add-cmpxchg64-and-cmpxchg64_local-to-powerpc.patch add-cmpxchg64-and-cmpxchg64_local-to-x86_64.patch add-cmpxchg_local-to-arm.patch add-cmpxchg_local-to-avr32.patch add-cmpxchg_local-to-blackfin-replace-__cmpxchg-by-generic-cmpxchg.patch add-cmpxchg_local-to-cris.patch add-cmpxchg_local-to-frv.patch add-cmpxchg_local-to-h8300.patch add-cmpxchg_local-cmpxchg64-and-cmpxchg64_local-to-ia64.patch new-cmpxchg_local-optimized-for-up-case-for-m32r.patch fix-m32r-__xchg.patch m32r-build-fix-of-arch-m32r-kernel-smpbootc.patch local_t-m32r-use-architecture-specific-cmpxchg_local.patch add-cmpxchg_local-to-m86k.patch add-cmpxchg_local-to-m68knommu.patch add-cmpxchg_local-to-parisc.patch add-cmpxchg_local-to-ppc.patch add-cmpxchg_local-to-s390.patch add-cmpxchg_local-to-sh-use-generic-cmpxchg-instead-of-cmpxchg_u32.patch add-cmpxchg_local-to-sh64.patch add-cmpxchg_local-to-sparc-move-__cmpxchg-to-systemh.patch add-cmpxchg_local-to-sparc64.patch add-cmpxchg_local-to-v850.patch add-cmpxchg_local-to-xtensa.patch create-arch-kconfig.patch add-arch_supports_oprofile.patch add-arch_supports_kprobes.patch move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html