Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 96e0d75dc05b8b89b7504526c63edcc760cea2ea..a3f436ba554d68b8becca9c86105914be4c98078 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -19,6 +19,7 @@ config ARM
        select ARCH_HAVE_CUSTOM_GPIO_H
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_MIGHT_HAVE_PC_PARPORT
+       select ARCH_NO_SG_CHAIN if !ARM_HAS_SG_CHAIN
        select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7
        select ARCH_SUPPORTS_ATOMIC_RMW
@@ -29,7 +30,7 @@ config ARM
        select CLONE_BACKWARDS
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
-       select DMA_DIRECT_OPS if !MMU
+       select DMA_REMAP if MMU
        select EDAC_SUPPORT
        select EDAC_ATOMIC_SCRUB
        select GENERIC_ALLOCATOR
@@ -103,6 +104,7 @@ config ARM
        select OF_RESERVED_MEM if OF
        select OLD_SIGACTION
        select OLD_SIGSUSPEND3
+       select PCI_SYSCALL if PCI
        select PERF_USE_VMALLOC
        select REFCOUNT_FULL
        select RTC_LIB
@@ -118,7 +120,6 @@ config ARM
          <http://www.arm.linux.org.uk/>.
 
 config ARM_HAS_SG_CHAIN
-       select ARCH_HAS_SG_CHAIN
        bool
 
 config ARM_DMA_USE_IOMMU
@@ -160,21 +161,6 @@ config HAVE_PROC_CPU
 config NO_IOPORT_MAP
        bool
 
-config EISA
-       bool
-       ---help---
-         The Extended Industry Standard Architecture (EISA) bus was
-         developed as an open alternative to the IBM MicroChannel bus.
-
-         The EISA bus provided some of the features of the IBM MicroChannel
-         bus while maintaining backward compatibility with cards made for
-         the older ISA bus.  The EISA bus saw limited use between 1988 and
-         1995 when it was made obsolete by the PCI bus.
-
-         Say Y here if you are building a kernel for an EISA-based machine.
-
-         Otherwise, say N.
-
 config SBUS
        bool
 
@@ -907,7 +893,7 @@ config PLAT_VERSATILE
 
 source "arch/arm/firmware/Kconfig"
 
-source arch/arm/mm/Kconfig
+source "arch/arm/mm/Kconfig"
 
 config IWMMXT
        bool "Enable iWMMXt support"
@@ -1233,17 +1219,12 @@ config PCI_NANOENGINE
        help
          Enable PCI on the BSE nanoEngine board.
 
-config PCI_SYSCALL
-       def_bool PCI
-
 config PCI_HOST_ITE8152
        bool
        depends on PCI && MACH_ARMCORE
        default y
        select DMABOUNCE
 
-source "drivers/pcmcia/Kconfig"
-
 endmenu
 
 menu "Kernel Features"
@@ -1784,6 +1765,21 @@ config XEN
        help
          Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
 
+config STACKPROTECTOR_PER_TASK
+       bool "Use a unique stack canary value for each task"
+       depends on GCC_PLUGINS && STACKPROTECTOR && SMP && !XIP_DEFLATED_DATA
+       select GCC_PLUGIN_ARM_SSP_PER_TASK
+       default y
+       help
+         Due to the fact that GCC uses an ordinary symbol reference from
+         which to load the value of the stack canary, this value can only
+         change at reboot time on SMP systems, and all tasks running in the
+         kernel's address space are forced to use the same canary value for
+         the entire duration that the system is up.
+
+         Enable this option to switch to a different method that uses a
+         different canary value for each task.
+
 endmenu
 
 menu "Boot options"