| Message ID | 1323777539-14542-2-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 6c4e979..083e9c0 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -41,6 +41,7 @@ CONFIG_DAB=y CONFIG_DAVICOM_PHY=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_PINCTRL is not set +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 f730d7a..8a74273 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -38,6 +38,7 @@ CONFIG_DEBUG_PINCTRL=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/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 5c4b8db..bec862e 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -31,6 +31,7 @@ CONFIG_DEBUG_PINCTRL=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_DM9000=m # CONFIG_DM_RAID45 is not set CONFIG_DVB_FE_CUSTOMISE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index af6d4e1..2eb8983 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1198,7 +1198,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 a939b29..f46f8f4 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -41,6 +41,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 063a1b7..5d254ab 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -36,6 +36,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 b45041b..b7e24fc 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -42,6 +42,7 @@ CONFIG_DEBUG_PINCTRL=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 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/armhf/config.common.armhf | 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 + 7 files changed, 6 insertions(+), 1 deletions(-)