@@ -47,6 +47,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_DAB=y
CONFIG_DAVICOM_PHY=y
CONFIG_DEBUG_INFO=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DL2K=m
# CONFIG_DM9000 is not set
CONFIG_DM_RAID45=m
@@ -44,6 +44,7 @@ CONFIG_DEBUG_INFO=y
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DL2K is not set
CONFIG_DM9000=m
# CONFIG_DM_RAID45 is not set
@@ -1145,7 +1145,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_IO_DELAY_TYPE=1
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_DEFAULT_NOOP is not set
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_SECURITY="apparmor"
@@ -24,7 +24,7 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y
!exists CONFIG_ACPI_CUSTOM_METHOD | value CONFIG_ACPI_CUSTOM_METHOD n
# Default to 32768 on ARM, 65536 for everything else.
( ( arch armel | arch armhf ) & value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768 ) | \
- ( value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536)
+ ( ( !arch armel & !arch armhf ) & value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536)
# CONFIG_USB_DEVICE_FS breaks udev USB firmware loading and is deprecated
# ensure it is disabled.
@@ -47,6 +47,7 @@ CONFIG_DEBUG_INFO=y
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DL2K=m
# CONFIG_DM9000 is not set
CONFIG_DM_RAID45=m
@@ -43,6 +43,7 @@ CONFIG_DAVICOM_PHY=m
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DL2K=m
# CONFIG_DM9000 is not set
# CONFIG_DM_RAID45 is not set
@@ -48,6 +48,7 @@ CONFIG_DAVICOM_PHY=m
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DL2K=m
# CONFIG_DM9000 is not set
# CONFIG_DM_RAID45 is not set
As suggested upstream, make DEFAULT_MMAP_MIN_ADDR=32768 on arm. While here, fix enforce and make it really stick to 32k on arm. BugLink: http://bugs.launchpad.net/bugs/903346 Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/enforce | 2 +- debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64/config.common.ppc64 | 1 + 7 files changed, 6 insertions(+), 2 deletions(-)