Message ID | 1323777539-14542-4-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 6180099..6bd436e 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -59,6 +59,7 @@ CONFIG_CRYPTO_SEQIV=m CONFIG_DAB=y CONFIG_DAVICOM_PHY=y CONFIG_DEBUG_INFO=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_DISPLAY_SUPPORT=m # CONFIG_DL2K is not set CONFIG_DM_MIRROR=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 6860819..46d139b 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_DM_MIRROR=y CONFIG_DM_MULTIPATH=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 5a8a56f..9fc4650 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1120,7 +1120,6 @@ CONFIG_DECOMPRESS_LZO=y CONFIG_DECOMPRESS_XZ=y CONFIG_DEFAULT_CUBIC=y CONFIG_DEFAULT_IO_DELAY_TYPE=1 -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 988e953..53f7e11 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -59,6 +59,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_DISPLAY_SUPPORT=m # CONFIG_DL2K is not set CONFIG_DM_MIRROR=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index c68dce0..ea33924 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -52,6 +52,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_DISPLAY_SUPPORT=m CONFIG_DL2K=m CONFIG_DM_MIRROR=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 203bb2a..9d55693 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -58,6 +58,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_DISPLAY_SUPPORT=m CONFIG_DL2K=m CONFIG_DM_MIRROR=m
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(-)