UBUNTU: SAUCE: Re-enable RODATA for i386 virtual

This basically reverts the following commit as it seems now fixed.

commit 0b111980fe515c5ab24bf21aca5aebd24c70f605
Author: Stefan Bader <stefan.bader@canonical.com>
Date:   Tue Jan 11 23:29:25 2011 +0000

    UBUNTU: Temporarily disable RODATA for virtual i386

    Setting to RO was ok, but the whole patchset seems to cause
    i386 EC instances to panic on boot when setting the kernel data
    to read-only and no-execute. So while there is no proper fix
    found disable this in the i386 virtual flavour.

BugLink: http://bugs.launchpad.net/bugs/809838

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9fd4f33..6180099 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -59,7 +59,6 @@ CONFIG_CRYPTO_SEQIV=m
 CONFIG_DAB=y
 CONFIG_DAVICOM_PHY=y
 CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_RODATA=y
 CONFIG_DISPLAY_SUPPORT=m
 # CONFIG_DL2K is not set
 CONFIG_DM_MIRROR=y

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 8e75666..6860819 100644 (file)
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -41,7 +41,6 @@ CONFIG_CRYPTO_SEQIV=m
 CONFIG_DAB=y
 CONFIG_DAVICOM_PHY=y
 CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_RODATA=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 0bfd697..5a8a56f 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1094,6 +1094,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 CONFIG_DEBUG_SET_MODULE_RONX=y

diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index e0411b9..67847e4 100644 (file)
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -15,8 +15,7 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y
 # For architectures which support this option ensure it is enabled.
 !exists CONFIG_SECCOMP | value CONFIG_SECCOMP y
 !exists CONFIG_CC_STACKPROTECTOR | value CONFIG_CC_STACKPROTECTOR y
-!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y | \
-       (flavour virtual & arch i386 & value CONFIG_DEBUG_RODATA n)
+!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y
 !exists CONFIG_DEBUG_SET_MODULE_RONX | value CONFIG_DEBUG_SET_MODULE_RONX y
 !exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y
 # For architectures which support this option ensure it is disabled.

diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
index b282bda..1148655 100644 (file)
--- a/debian.master/config/i386/config.flavour.generic
+++ b/debian.master/config/i386/config.flavour.generic
@@ -3,7 +3,6 @@
 #
 # CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_DEBUG_RODATA=y
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_INTEL_IDLE=y

diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
index 7a12bef..3620b5b 100644 (file)
--- a/debian.master/config/i386/config.flavour.generic-pae
+++ b/debian.master/config/i386/config.flavour.generic-pae
@@ -3,7 +3,6 @@
 #
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_DEBUG_RODATA=y
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
 CONFIG_INTEL_IDLE=y

diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual
index c72e8f7..d4ddb92 100644 (file)
--- a/debian.master/config/i386/config.flavour.virtual
+++ b/debian.master/config/i386/config.flavour.virtual
@@ -3,7 +3,6 @@
 #
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-# CONFIG_DEBUG_RODATA is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
 # CONFIG_INTEL_IDLE is not set

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 9d583e8..c68dce0 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -49,7 +49,6 @@ CONFIG_CRYPTO_HMAC=y
 # CONFIG_DAB is not set
 CONFIG_DAVICOM_PHY=m
 # CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_RODATA=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"