1 files changed, 19 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4b1a8e3d292c..36176f40dfdf 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -10,6 +10,8 @@ config ARM
         default y
         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
@@ -135,6 +137,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,8 +1147,6 @@ endmenu
 
 source "fs/Kconfig"
 
-source "arch/arm/Kconfig.instrumentation"
-
 source "arch/arm/Kconfig.debug"
 
 source "security/Kconfig"