Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9d8b7f9bca1df42fc7961d5b6d36ea3308668501..64d19eff3faaacdf56eb0f6b6882518cf72d2bbb 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -10,6 +10,8 @@ config ARM
        default y
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
        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
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and


@@ -140,6 +142,23 @@ config FIQ
 config ARCH_MTD_XIP
        bool
 
 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
 config VECTORS_BASE
        hex
        default 0xffff0000 if MMU || CPU_HIGH_VECTOR


@@ -623,8 +642,7 @@ config SMP
          processor machines. On a single processor machine, the kernel will
          run faster if you say N here.
 
          processor machines. On a single processor machine, the kernel will
          run faster if you say N here.
 

-         See also the <file:Documentation/smp.txt>,
-         <file:Documentation/i386/IO-APIC.txt>,
+         See also <file:Documentation/i386/IO-APIC.txt>,

          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
          <http://www.linuxdoc.org/docs.html#howto>.
 
          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
          <http://www.linuxdoc.org/docs.html#howto>.
 


@@ -1142,8 +1160,6 @@ endmenu
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "arch/arm/Kconfig.instrumentation"
-

 source "arch/arm/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/arm/Kconfig.debug"
 
 source "security/Kconfig"