@@ -19,7 +19,7 @@ CONFIG_CMDLINE="console=ttyAMA0"
# CONFIG_DEFAULT_CFQ is not set
CONFIG_DEFAULT_DEADLINE=y
CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_DMA_VIRTUAL_CHANNELS=y
# CONFIG_EM_TIMER_STI is not set
CONFIG_FB_ATY128=m
@@ -24,8 +24,8 @@ value CONFIG_DEBUG_INFO y
# For architectures which support this option ensure it is disabled.
!exists CONFIG_COMPAT_VDSO | value CONFIG_COMPAT_VDSO n
!exists CONFIG_ACPI_CUSTOM_METHOD | value CONFIG_ACPI_CUSTOM_METHOD n
-# Default to 32768 on ARM, 65536 for everything else.
-(arch armel armhf &/ value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768) | \
+# Default to 32768 on ARM, 65536 for everything else -- arm64 and armhf must match (LP:1418140)
+(arch armel armhf arm64 &/ value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768) | \
value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536
#LP#1105230 and LP#1385510
Attempting to run 32bit binaries on arm64 triggers applications to be Killed, as the CONFIG_DEFAULT_MMAP_MIN_ADDR used on armhf is not valid on arm64. While this can be overriden via sysctl, the default should be sane. BugLink: http://bugs.launchpad.net/bugs/1418140 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian.master/config/arm64/config.common.arm64 | 2 +- debian.master/config/enforce | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)