From patchwork Thu Mar 14 14:26:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 227671 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 21DAB2C00B1 for ; Fri, 15 Mar 2013 01:26:27 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UG96p-0003uk-Pg; Thu, 14 Mar 2013 14:26:19 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UG96j-0003sM-JR for kernel-team@lists.ubuntu.com; Thu, 14 Mar 2013 14:26:13 +0000 Received: from 64-126-113-177.dyn.everestkc.net ([64.126.113.177] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UG96j-0001Cn-63 for kernel-team@lists.ubuntu.com; Thu, 14 Mar 2013 14:26:13 +0000 From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] Re-enable CONFIG_PSTORE for x86 Date: Thu, 14 Mar 2013 09:26:06 -0500 Message-Id: <1363271166-18418-3-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363271166-18418-1-git-send-email-seth.forshee@canonical.com> References: <1363271166-18418-1-git-send-email-seth.forshee@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com It's now possible to have both efivars and pstore enabled without using efivars as a storage backend for pstore. Revert the changes from commit 4113c3c (UBUNTU: [Config] CONFIG_PSTORE=n for x86) and set CONFIG_EFI_VARS_PSTORE=n to help avoid bricking some UEFI machines. Signed-off-by: Seth Forshee --- .../abi/3.8.0-11.20/amd64/generic.modules | 2 ++ debian.master/abi/3.8.0-11.20/i386/generic.modules | 2 ++ debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 9 ++++++++- debian.master/config/i386/config.common.i386 | 1 - 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian.master/abi/3.8.0-11.20/amd64/generic.modules b/debian.master/abi/3.8.0-11.20/amd64/generic.modules index 338ba0c..34f292c 100644 --- a/debian.master/abi/3.8.0-11.20/amd64/generic.modules +++ b/debian.master/abi/3.8.0-11.20/amd64/generic.modules @@ -849,6 +849,7 @@ eeprom_93cx6 eeprom_93xx46 eeti_ts efs +einj elo elsa_cs em28xx @@ -2361,6 +2362,7 @@ raid456 raid6_pq raid6test raid_class +ramoops raw ray_cs rbd diff --git a/debian.master/abi/3.8.0-11.20/i386/generic.modules b/debian.master/abi/3.8.0-11.20/i386/generic.modules index e698323..4585af3 100644 --- a/debian.master/abi/3.8.0-11.20/i386/generic.modules +++ b/debian.master/abi/3.8.0-11.20/i386/generic.modules @@ -902,6 +902,7 @@ eeti_ts eexpress efficeon-agp efs +einj elo elsa_cs em28xx @@ -2501,6 +2502,7 @@ raid456 raid6_pq raid6test raid_class +ramoops raw ray_cs rbd diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 8850d10..c851f3f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -113,7 +113,6 @@ CONFIG_PPP_MULTILINK=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_RCU is not set CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PSTORE is not set CONFIG_RCU_FANOUT=64 CONFIG_REGMAP_MMIO=m CONFIG_REGULATOR_FIXED_VOLTAGE=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 941f84b..132cf3d 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -29,7 +29,6 @@ CONFIG_NOP_USB_XCEIV=y CONFIG_NR_CPUS=4 # CONFIG_PCCARD is not set # CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_PSTORE=y CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_MMIO=y CONFIG_REGULATOR_FIXED_VOLTAGE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 21a2d01..6966ea0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -30,7 +30,12 @@ CONFIG_ACORN_PARTITION_ICS=y CONFIG_ACORN_PARTITION_RISCIX=y CONFIG_ACPI=y CONFIG_ACPI_AC=y -# CONFIG_ACPI_APEI is not set +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_EINJ=m +# CONFIG_ACPI_APEI_ERST_DEBUG is not set +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BGRT=y CONFIG_ACPI_BUTTON=y @@ -1656,6 +1661,7 @@ CONFIG_EFI=y CONFIG_EFI_PARTITION=y CONFIG_EFI_STUB=y CONFIG_EFI_VARS=y +# CONFIG_EFI_VARS_PSTORE is not set CONFIG_EFS_FS=m CONFIG_EISA=y CONFIG_EISA_NAMES=y @@ -4347,6 +4353,7 @@ CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set # CONFIG_PROVE_RCU_DELAY is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_FTRACE is not set CONFIG_PSTORE_RAM=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 072056e..7cd4955 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -112,7 +112,6 @@ CONFIG_PPP_MULTILINK=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_RCU is not set CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PSTORE is not set CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_MMIO=m CONFIG_REGULATOR_FIXED_VOLTAGE=m