summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2012-11-20 09:45:08 +0000
committerPeter Robinson <pbrobinson@gmail.com>2012-11-20 09:45:08 +0000
commit6d041dc4e32996cc724a308cca05fbb285aba952 (patch)
treed112273be3843450ad07c8d1cc1bb13f3a7c2cf1 /config-arm-generic
parentad6cd36832165317bee01afe00131bfccfaf1e89 (diff)
downloadkernel-6d041dc4e32996cc724a308cca05fbb285aba952.tar.gz
kernel-6d041dc4e32996cc724a308cca05fbb285aba952.tar.xz
kernel-6d041dc4e32996cc724a308cca05fbb285aba952.zip
Change the minimum mmap address back to 32768 on ARM systems (thanks to Jon Masters), Add patch to fix unified kernel build failure
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic4
1 files changed, 3 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 26565ccbb..b6be5388a 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -37,7 +37,6 @@ CONFIG_ARM_ERRATA_742231=y
CONFIG_ARM_ERRATA_754327=y
CONFIG_ARM_ERRATA_764369=y
-
# Generic ARM config options
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
@@ -74,6 +73,9 @@ CONFIG_SUSPEND=y
CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+
# CONFIG_XEN is not set
CONFIG_THERMAL=y