Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel...

diff --combined arch/arm/Kconfig
index 44b6d9b424834b6b5c62ce38a4b88a14520dfdcd,fab2ddd4dcf600358f01fa9f292c61c142000c1b..c1e0cdfd11473ad7d8881527fd0286191f7083b5
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -301,6 -301,7 +301,7 @@@ config ARCH_CNS3XX
        select CPU_V6
        select GENERIC_CLOCKEVENTS
        select ARM_GIC
+       select PCI_DOMAINS if PCI
        help
          Support for Cavium Networks CNS3XXX platform.
  
@@@ -586,7 -587,6 +587,7 @@@ config ARCH_MS
        bool "Qualcomm MSM"
        select HAVE_CLK
        select GENERIC_CLOCKEVENTS
 +      select ARCH_REQUIRE_GPIOLIB
        help
          Support for Qualcomm MSM/QSD based systems.  This runs on the
          apps processor of the MSM/QSD and depends on a shared memory
@@@ -956,8 -956,7 +957,8 @@@ config XSCALE_PM
        default y
  
  config CPU_HAS_PMU
 -      depends on CPU_V6 || CPU_V7 || XSCALE_PMU
 +      depends on (CPU_V6 || CPU_V7 || XSCALE_PMU) && \
 +                 (!ARCH_OMAP3 || OMAP3_EMU)
        default y
        bool
  
@@@ -1061,7 -1060,7 +1062,7 @@@ config ISA_DMA_AP
        bool
  
  config PCI
-       bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE
+       bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_CNS3XXX
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside
@@@ -1376,18 -1375,6 +1377,18 @@@ config UACCESS_WITH_MEMCP
          However, if the CPU data cache is using a write-allocate mode,
          this option is unlikely to provide any performance gain.
  
 +config CC_STACKPROTECTOR
 +      bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
 +      help
 +        This option turns on the -fstack-protector GCC feature. This
 +        feature puts, at the beginning of functions, a canary value on
 +        the stack just before the return address, and validates
 +        the value just before actually returning.  Stack based buffer
 +        overflows (that need to overwrite this return address) now also
 +        overwrite the canary, which gets detected and the attack is then
 +        neutralized via a kernel panic.
 +        This feature requires gcc version 4.2 or above.
 +
  endmenu
  
  menu "Boot options"