| Message ID | 1323777539-14542-3-git-send-email-paolo.pisati@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 2acd8f6..014db00 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -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 diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index d10549b..bbf8397 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -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 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 35a58a5..d761007 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -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" diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 4e4c29d..a3bc475 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -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 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 678df05..093b0ea 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -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 diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 8341066..ac53ab5 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -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. 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/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64/config.common.ppc64 | 1 + 6 files changed, 5 insertions(+), 1 deletions(-)