diff mbox

[xenial] UBUNTU: [config] s390x -- CONFIG_DEFAULT_MMAP_MIN_ADDR=65536

Message ID 1456570236-21366-1-git-send-email-sbeattie@ubuntu.com
State New
Headers show

Commit Message

Steve Beattie Feb. 27, 2016, 10:50 a.m. UTC 
From: Steve Beattie <steve.beattie@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1531327

Make the s390x MMAP_MIN_ADDR config consistent with most other
architectures.

Signed-off-by: Steve Beattie <steve.beattie@canonical.com>
---
 debian.master/config/annotations               | 2 +-
 debian.master/config/s390x/config.common.s390x | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Tim Gardner Feb. 28, 2016, 4:18 p.m. UTC | #1
diff mbox

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f13dc79..9fb9299 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9461,7 +9461,7 @@  CONFIG_COMPACTION                               policy<{'amd64': 'y', 'arm64': '
 CONFIG_MIGRATION                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_BOUNCE                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_KSM                                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_DEFAULT_MMAP_MIN_ADDR                    policy<{'amd64': '65536', 'arm64': '32768', 'armhf': '32768', 'i386': '65536', 'powerpc': '65536', 'ppc64el': '65536', 's390x': '4096'}>
+CONFIG_DEFAULT_MMAP_MIN_ADDR                    policy<{'amd64': '65536', 'arm64': '32768', 'armhf': '32768', 'i386': '65536', 'powerpc': '65536', 'ppc64el': '65536', 's390x': '65536'}>
 CONFIG_MEMORY_FAILURE                           policy<{'amd64': 'y', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y'}>
 CONFIG_HWPOISON_INJECT                          policy<{'amd64': 'm', 'powerpc-powerpc64-smp': 'm', 'ppc64el': 'm'}>
 CONFIG_TRANSPARENT_HUGEPAGE                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index eab8bf9..61a707e 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -61,7 +61,7 @@  CONFIG_CRASH_DUMP=y
 # CONFIG_CXL_EEH is not set
 # CONFIG_CXL_KERNEL_API is not set
 # CONFIG_DECNET is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DMADEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_DM_DEBUG=y