Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes

diff --combined arch/arm/mach-imx/Kconfig
index 606b52680f6a9447d91764d91e3d979fd5c5b74b,28fa2fa49e5dc4d8a4490377c62bd62324018d15..4b5185748f744a47b7742d66a59bda80715d9b90
--- 1/arch/arm/mach-imx/Kconfig
--- 2/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -1,6 -1,5 +1,5 @@@
- config ARCH_MXC
+ menuconfig ARCH_MXC
        bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
-       select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARCH_REQUIRE_GPIOLIB
        select ARM_CPU_SUSPEND if PM
@@@ -13,8 -12,7 +12,7 @@@
        help
          Support for Freescale MXC/iMX-based family of processors
  
- menu "Freescale i.MX support"
-       depends on ARCH_MXC
+ if ARCH_MXC
  
  config MXC_TZIC
        bool
@@@ -99,7 -97,6 +97,6 @@@ config SOC_IMX2
  
  config SOC_IMX27
        bool
-       select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select CPU_ARM926T
        select IMX_HAVE_IOMUX_V1
@@@ -124,7 -121,6 +121,6 @@@ config SOC_IMX3
  
  config SOC_IMX5
        bool
-       select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARCH_MXC_IOMUX_V3
        select MXC_TZIC
@@@ -738,9 -734,9 +734,9 @@@ config SOC_IMX
        select HAVE_IMX_MMDC
        select HAVE_IMX_SRC
        select MFD_SYSCON
 -      select PL310_ERRATA_588369 if CACHE_PL310
 -      select PL310_ERRATA_727915 if CACHE_PL310
 -      select PL310_ERRATA_769419 if CACHE_PL310
 +      select PL310_ERRATA_588369 if CACHE_L2X0
 +      select PL310_ERRATA_727915 if CACHE_L2X0
 +      select PL310_ERRATA_769419 if CACHE_L2X0
  
  config SOC_IMX6Q
        bool "i.MX6 Quad/DualLite support"
@@@ -775,9 -771,9 +771,9 @@@ config SOC_VF61
        select ARM_GIC
        select PINCTRL_VF610
        select VF_PIT_TIMER
 -      select PL310_ERRATA_588369 if CACHE_PL310
 -      select PL310_ERRATA_727915 if CACHE_PL310
 -      select PL310_ERRATA_769419 if CACHE_PL310
 +      select PL310_ERRATA_588369 if CACHE_L2X0
 +      select PL310_ERRATA_727915 if CACHE_L2X0
 +      select PL310_ERRATA_769419 if CACHE_L2X0
  
        help
          This enable support for Freescale Vybrid VF610 processor.
@@@ -786,4 -782,4 +782,4 @@@ endi
  
  source "arch/arm/mach-imx/devices/Kconfig"
  
- endmenu
+ endif

diff --combined arch/arm/mach-omap2/Kconfig
index 2ff3f23e31b0eac4f15c2fc45520b4bf8ec6b55a,062505345c953c80391226d0cc94ee3a89f0300f..1c1ed737f7ab763437c81a8223fd1a05fc2850a5
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -1,3 -1,6 +1,6 @@@
+ menu "TI OMAP/AM/DM/DRA Family"
+       depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
+ 
  config ARCH_OMAP
        bool
  
@@@ -28,12 -31,11 +31,11 @@@ config ARCH_OMAP
        select ARM_CPU_SUSPEND if PM
        select ARM_ERRATA_720789
        select ARM_GIC
-       select CACHE_L2X0
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select OMAP_INTERCONNECT
 -      select PL310_ERRATA_588369
 -      select PL310_ERRATA_727915
 +      select PL310_ERRATA_588369 if CACHE_L2X0
 +      select PL310_ERRATA_727915 if CACHE_L2X0
        select PM_OPP if PM
        select PM_RUNTIME if CPU_IDLE
        select ARM_ERRATA_754322
@@@ -80,7 -82,6 +82,6 @@@ config SOC_DRA7X
  config ARCH_OMAP2PLUS
        bool
        select ARCH_HAS_BANDGAP
-       select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_OMAP
        select ARCH_REQUIRE_GPIOLIB
@@@ -343,3 -344,5 +344,5 @@@ config OMAP4_ERRATA_I68
  endmenu
  
  endif
+ 
+ endmenu

diff --combined arch/arm/mach-sti/Kconfig
index 1831e96117614e4a36f2d7e56223bff051326aaf,7e33e9d2c42e73e468209b361bde1eaac48b62c7..878e9ec97d0fc810249628533c3ff4acc2e11d15
--- 1/arch/arm/mach-sti/Kconfig
--- 2/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@@ -1,5 -1,5 +1,5 @@@
  menuconfig ARCH_STI
-       bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7
+       bool "STMicroelectronics Consumer Electronics SOCs" if ARCH_MULTI_V7
        select ARM_GIC
        select ARM_GLOBAL_TIMER
        select PINCTRL
@@@ -11,8 -11,8 +11,8 @@@
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP
        select ARM_ERRATA_775420
 -      select PL310_ERRATA_753970 if CACHE_PL310
 -      select PL310_ERRATA_769419 if CACHE_PL310
 +      select PL310_ERRATA_753970 if CACHE_L2X0
 +      select PL310_ERRATA_769419 if CACHE_L2X0
        help
          Include support for STiH41x SOCs like STiH415/416 using the device tree
          for discovery

diff --combined arch/arm/mach-ux500/Kconfig
index 86f5372773838970d452920df36f0dc9fc11572b,5be7c4583a9348855689c94829b7b6f96e71c02a..699e8601dbf0bb935e2edb5887c998a1a1228242
--- 1/arch/arm/mach-ux500/Kconfig
--- 2/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@@ -1,9 -1,8 +1,8 @@@
- config ARCH_U8500
+ menuconfig ARCH_U8500
        bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7
        depends on MMU
        select AB8500_CORE
        select ABX500_CORE
-       select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select ARM_ERRATA_754322
@@@ -16,7 -15,7 +15,7 @@@
        select PINCTRL
        select PINCTRL_ABX500
        select PINCTRL_NOMADIK
 -      select PL310_ERRATA_753970 if CACHE_PL310
 +      select PL310_ERRATA_753970 if CACHE_L2X0
        help
          Support for ST-Ericsson's Ux500 architecture
  
@@@ -34,8 -33,6 +33,6 @@@ config UX500_SOC_DB850
        select REGULATOR
        select REGULATOR_DB8500_PRCMU
  
- menu "Ux500 target platform (boards)"
- 
  config MACH_MOP500
        bool "U8500 Development platform, MOP500 versions"
        select I2C
@@@ -68,8 -65,6 +65,6 @@@ config UX500_AUTO_PLATFOR
          a working kernel. If everything else is disabled, this
          automatically enables MACH_MOP500.
  
- endmenu
- 
  config UX500_DEBUG_UART
        int "Ux500 UART to use for low-level debug"
        default 2

diff --combined arch/arm/mach-vexpress/Kconfig
index a423de4724abdc2076830d6f0c05edb6d9e0df2a,99c1f151c403c07cdeb5b1f575d65a64594d6d60..d8b9330f896a3edac20a11355d8b60b9a613f824
--- 1/arch/arm/mach-vexpress/Kconfig
--- 2/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@@ -1,4 -1,4 +1,4 @@@
- config ARCH_VEXPRESS
+ menuconfig ARCH_VEXPRESS
        bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_SUPPORTS_BIG_ENDIAN
@@@ -37,14 -37,13 +37,13 @@@
          platforms. The traditional (ATAGs) boot method is not usable on
          these boards with this option.
  
- menu "Versatile Express platform type"
-       depends on ARCH_VEXPRESS
+ if ARCH_VEXPRESS
  
  config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
        bool "Enable A5 and A9 only errata work-arounds"
        default y
        select ARM_ERRATA_720789
 -      select PL310_ERRATA_753970 if CACHE_PL310
 +      select PL310_ERRATA_753970 if CACHE_L2X0
        help
          Provides common dependencies for Versatile Express platforms
          based on Cortex-A5 and Cortex-A9 processors. In order to
@@@ -65,7 -64,6 +64,6 @@@ config ARCH_VEXPRESS_DCSC
  
  config ARCH_VEXPRESS_SPC
        bool "Versatile Express Serial Power Controller (SPC)"
-       select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select PM_OPP
        help
@@@ -83,4 -81,4 +81,4 @@@ config ARCH_VEXPRESS_TC2_P
          Support for CPU and cluster power management on Versatile Express
          with a TC2 (A15x2 A7x3) big.LITTLE core tile.
  
- endmenu
+ endif