From e171d9b959bd7ec54693ededde95fa1ad2297d96 Mon Sep 17 00:00:00 2001
From: Maximilian Attems <maks@debian.org>
Date: Tue, 20 Oct 2009 08:23:10 +0000
Subject: [PATCH] topconfig set LSM_MMAP_MIN_ADDR to redcommended 32768

for x86_32 to zero, for x86_64 and ia64 to 65536.

svn path=/dists/trunk/linux-2.6/; revision=14420
---
 debian/changelog                            | 3 ++-
 debian/config/config                        | 2 +-
 debian/config/ia64/config                   | 5 +++++
 debian/config/kernelarch-x86/config-arch-32 | 4 ++++
 debian/config/kernelarch-x86/config-arch-64 | 4 ++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89b5b9b8b..292e52cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,8 @@ linux-2.6 (2.6.31-1~experimental.3) UNRELEASED; urgency=low
   * [alpha] Disable SND_MIXART, causes gcc ICE.
   * [x86] Enable modular X86_MCE_INJECT.
   * [x86_64] Set LOG_BUF_SHIFT to 2^18.
-  * Set LSM_MMAP_MIN_ADDR to zero to unbreak dosemu and 16-bit Wine.
+  * [x86_32] Set LSM_MMAP_MIN_ADDR to zero to unbreak dosemu and 16-bit Wine,
+    ia64 and x86_64 to 65536 otherwise default to 32768.
   * Unset UEVENT_HELPER_PATH to save some boot cycles.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 13 Oct 2009 02:18:40 +0100
diff --git a/debian/config/config b/debian/config/config
index 66accaf3e..c857443d8 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3684,7 +3684,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_PATH is not set
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_LSM_MMAP_MIN_ADDR=32768
 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096
 
 ##
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index c420a9259..fe89bd214 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -842,6 +842,11 @@ CONFIG_IRLAN=m
 ##
 CONFIG_IRNET=m
 
+##
+## file: security/Kconfig
+##
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+
 ##
 ## file: sound/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index 6f6948b48..5aa8ee82f 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -93,3 +93,7 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
 
+##
+## file: security/Kconfig
+##
+CONFIG_LSM_MMAP_MIN_ADDR=0
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index a7b3816be..53fd933dc 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -68,3 +68,7 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_MIGRATION=y
 
+##
+## file: security/Kconfig
+##
+CONFIG_LSM_MMAP_MIN_ADDR=65536