[kernel/f15] arm config changes to enable selinux to work everywhere

[Dennis Gilmore]

commit 8491a176750a171fc7933e71b82fcce049bcbaf0
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Nov 18 18:10:17 2011 -0600

    arm config changes to enable selinux to work everywhere

 config-arm-generic      |    3 +++
 config-arm-omap-generic |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index 307c66d..12ae3c3 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -156,6 +156,9 @@ CONFIG_MMC_SDHCI_PXAV2=m
 
 CONFIG_FTGMAC100=m
 
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+
 # disable TPM on arm at least on the trimslices it causes havoc
 # CONFIG_TCG_TPM is not set
 # CONFIG_IMA is not set
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index 8c3ae6a..16e6653 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -147,7 +147,6 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
@@ -1063,8 +1062,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_OC_ETM=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_LSM_MMAP_MIN_ADDR=0
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
 # CONFIG_IMA is not set
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_RNG=m