From patchwork Wed Jul 13 14:37:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 104519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id B29EEB6F54 for ; Thu, 14 Jul 2011 00:38:05 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Qh0ZY-00076D-Bx; Wed, 13 Jul 2011 14:37:56 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Qh0ZM-00072V-P0 for kernel-team@lists.ubuntu.com; Wed, 13 Jul 2011 14:37:44 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Qh0ZM-0004Gi-Na for ; Wed, 13 Jul 2011 14:37:44 +0000 Received: from p5b2e56c1.dip.t-dialin.net ([91.46.86.193] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Qh0ZM-00018J-DN for kernel-team@lists.ubuntu.com; Wed, 13 Jul 2011 14:37:44 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [Natty SRU] UBUNTU: SAUCE: Re-enable RODATA for i386 virtual Date: Wed, 13 Jul 2011 16:37:40 +0200 Message-Id: <1310567861-13700-2-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1310567861-13700-1-git-send-email-stefan.bader@canonical.com> References: <1310567861-13700-1-git-send-email-stefan.bader@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From 47cde49e9a25d5fd6b8ec01aeb1b0611538d6e13 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Tue, 12 Jul 2011 13:31:16 +0000 Subject: [PATCH] UBUNTU: SAUCE: Re-enable RODATA for i386 virtual This basically reverts the following commit as it seems now fixed. commit 0b111980fe515c5ab24bf21aca5aebd24c70f605 Author: Stefan Bader 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 Acked-by: Herton Ronaldo Krzesinski Acked-by: Brad Figg --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armel/config.common.armel | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/enforce | 3 +-- debian.master/config/i386/config.flavour.generic | 1 - .../config/i386/config.flavour.generic-pae | 1 - debian.master/config/i386/config.flavour.virtual | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - 8 files changed, 2 insertions(+), 8 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 9fd4f33..6180099 100644 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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"