9 files changed, 12 insertions, 1 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3b3eb4ec3189..ea45eefbf832 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index b46932c4f9f1..0e56e96a17a7 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -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
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 5e410f200c04..8db6324f7a83 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -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
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c3c29e7d281a..c6f3eb58e4ed 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -88,6 +88,7 @@ config PPC
         bool
         default y
         select HAVE_OPROFILE
+        select HAVE_KPROBES
 
 config EARLY_PRINTK
         bool
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index ea9eb4891b23..92e37f5b365b 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -43,6 +43,7 @@ config PPC
         bool
         default y
         select HAVE_OPROFILE
+        select HAVE_KPROBES
 
 config PPC32
         bool
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index c561f6fc3d75..272c6c80fd7b 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -52,6 +52,7 @@ mainmenu "Linux Kernel Configuration"
 config S390
         def_bool y
         select HAVE_OPROFILE
+        select HAVE_KPROBES
 
 source "init/Kconfig"
 
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index ca14d880d624..cbdc80d74bcb 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -9,6 +9,7 @@ config SPARC
         bool
         default y
         select HAVE_OPROFILE
+        select HAVE_KPROBES
 
 config SPARC64
         bool
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 65594884f32f..72db31c78666 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -19,6 +19,7 @@ config X86_64
 config X86
         def_bool y
         select HAVE_OPROFILE
+        select HAVE_KPROBES
 
 config GENERIC_LOCKBREAK
         def_bool n
diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
index d9d010a271db..2195b6544575 100644
--- a/kernel/Kconfig.instrumentation
+++ b/kernel/Kconfig.instrumentation
@@ -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