UBUNTU: SAUCE: Re-enable RODATA for i386 virtual

[linux-flexiantxendom0-natty.git] / debian.master / config / enforce

diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index 19316ea..67847e4 100644 (file)
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -20,8 +20,8 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y
 !exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y
 # For architectures which support this option ensure it is disabled.
 !exists CONFIG_COMPAT_VDSO | value CONFIG_COMPAT_VDSO n
-# Default to 32768 for armel, 65536 for everything else.
-( arch armel & value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768 ) | \
+# 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)
 
 # CONFIG_USB_DEVICE_FS breaks udev USB firmware loading and is deprecated
@@ -54,8 +54,9 @@ value CONFIG_FRAMEBUFFER_CONSOLE y
 
 # GRUB changes will rely on built in vesafb on x86,
 # UbuntuSpec:foundations-m-grub2-boot-framebuffer
-(( arch i386 | arch amd64 ) & value CONFIG_FB_VESA y) | \
-       value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
+#(( arch i386 | arch amd64 ) & value CONFIG_FB_VESA y) | \
+#      value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
+value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
 
 # Build in uinput module so that it's always available (LP: 584812)
 value CONFIG_INPUT_UINPUT y