Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d1346a16076033acb8d3d60e5de846d7ee2e0e3b..51c8df5610777459c727e30cc65ef6fe7aa41b66 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -3,6 +3,7 @@ config ARM
        bool
        default y
        select ARCH_CLOCKSOURCE_DATA
+       select ARCH_DISCARD_MEMBLOCK if !HAVE_ARCH_PFN_VALID
        select ARCH_HAS_DEBUG_VIRTUAL
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_HAS_ELF_RANDOMIZE
@@ -240,15 +241,6 @@ config NEED_RET_TO_USER
 config ARCH_MTD_XIP
        bool
 
-config VECTORS_BASE
-       hex
-       default 0xffff0000 if MMU || CPU_HIGH_VECTOR
-       default DRAM_BASE if REMAP_VECTORS_TO_RAM
-       default 0x00000000
-       help
-         The base address of exception vectors.  This must be two pages
-         in size.
-
 config ARM_PATCH_PHYS_VIRT
        bool "Patch physical to virtual translations at runtime" if EMBEDDED
        default y
@@ -379,7 +371,7 @@ config ARCH_EBSA110
 
 config ARCH_EP93XX
        bool "EP93xx-based"
-       select ARCH_HAS_HOLES_MEMORYMODEL
+       select ARCH_SPARSEMEM_ENABLE
        select ARM_AMBA
        imply ARM_PATCH_PHYS_VIRT
        select ARM_VIC
@@ -2006,6 +1998,17 @@ config XIP_PHYS_ADDR
          be linked for and stored to.  This address is dependent on your
          own flash usage.
 
+config XIP_DEFLATED_DATA
+       bool "Store kernel .data section compressed in ROM"
+       depends on XIP_KERNEL
+       select ZLIB_INFLATE
+       help
+         Before the kernel is actually executed, its .data section has to be
+         copied to RAM from ROM. This option allows for storing that data
+         in compressed form and decompressed to RAM rather than merely being
+         copied, saving some precious ROM space. A possible drawback is a
+         slightly longer boot delay.
+
 config KEXEC
        bool "Kexec system call (EXPERIMENTAL)"
        depends on (!SMP || PM_SLEEP_SMP)