Patchwork [v2,P/master] UBUNTU: [Config] DEFAULT_MMAP_MIN_ADDR=32k on arm

login
register
mail settings
Submitter Paolo Pisati
Date Dec. 13, 2011, 2:47 p.m.
Message ID <1323787674-17691-1-git-send-email-paolo.pisati@canonical.com>
Download mbox | patch
Permalink /patch/131112/
State New
Headers show

Comments

Paolo Pisati - Dec. 13, 2011, 2:47 p.m.
As suggested upstream, make DEFAULT_MMAP_MIN_ADDR=32768 on arm.
While here, fix enforce and make it really stick to 32k 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/enforce                       |    2 +-
 debian.master/config/i386/config.common.i386       |    1 +
 debian.master/config/powerpc/config.common.powerpc |    1 +
 debian.master/config/ppc64/config.common.ppc64     |    1 +
 8 files changed, 7 insertions(+), 2 deletions(-)
Tim Gardner - Dec. 13, 2011, 4:38 p.m.
On 12/13/2011 07:47 AM, Paolo Pisati wrote:
> As suggested upstream, make DEFAULT_MMAP_MIN_ADDR=32768 on arm.
> While here, fix enforce and make it really stick to 32k 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/enforce                       |    2 +-
>   debian.master/config/i386/config.common.i386       |    1 +
>   debian.master/config/powerpc/config.common.powerpc |    1 +
>   debian.master/config/ppc64/config.common.ppc64     |    1 +
>   8 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 7c8b1cf..200feeb 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 53227a5..95c5255 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 0d392b9..5d20a98 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 ebb8d5a..7e30f4b 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/enforce b/debian.master/config/enforce
> index ffa0202..fb78e7f 100644
> --- a/debian.master/config/enforce
> +++ b/debian.master/config/enforce
> @@ -24,7 +24,7 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y
>   !exists CONFIG_ACPI_CUSTOM_METHOD | value CONFIG_ACPI_CUSTOM_METHOD n
>   # Default to 32768 on ARM, 65536 for everything else.
>   ( ( arch armel | arch armhf )&  value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768 ) | \
> -	( value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536)
> +	( ( !arch armel&  !arch armhf )&  value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536)
>
>   # CONFIG_USB_DEVICE_FS breaks udev USB firmware loading and is deprecated
>   # ensure it is disabled.
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index e3c3587..5b3efb6 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 815e7d4..ee371dd 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 2e787cf..b408810 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

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 7c8b1cf..200feeb 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 53227a5..95c5255 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 0d392b9..5d20a98 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 ebb8d5a..7e30f4b 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/enforce b/debian.master/config/enforce
index ffa0202..fb78e7f 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -24,7 +24,7 @@  value CONFIG_DEFAULT_SECURITY_APPARMOR y
 !exists CONFIG_ACPI_CUSTOM_METHOD | value CONFIG_ACPI_CUSTOM_METHOD n
 # Default to 32768 on ARM, 65536 for everything else.
 ( ( arch armel | arch armhf ) & value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768 ) | \
-	( value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536)
+	( ( !arch armel & !arch armhf ) & value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536)
 
 # CONFIG_USB_DEVICE_FS breaks udev USB firmware loading and is deprecated
 # ensure it is disabled.
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e3c3587..5b3efb6 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 815e7d4..ee371dd 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 2e787cf..b408810 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