From 3d4581bc7c1e7e1cf05307be942ade33946c02dd Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Mon, 11 Mar 2013 16:17:50 -0500 Subject: [PATCH] --- yaml --- r: 361723 b: refs/heads/master c: ec0971ba5372a4dfa753f232449d23a8fd98490e h: refs/heads/master i: 361721: 8fb538b2a5b106e64420d30282ed59d5f309d2bd 361719: 2fab1cc85d0b643d16a30476c9e1b01fc0bf17e0 v: v3 --- [refs] | 2 +- trunk/drivers/firmware/Kconfig | 9 +++++++++ trunk/drivers/firmware/efivars.c | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 337953066e2f..807be88e43b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed9dc8ce7a1c8115dba9483a9b51df8b63a2e0ef +refs/heads/master: ec0971ba5372a4dfa753f232449d23a8fd98490e diff --git a/trunk/drivers/firmware/Kconfig b/trunk/drivers/firmware/Kconfig index 898023d8e486..42c759a4d047 100644 --- a/trunk/drivers/firmware/Kconfig +++ b/trunk/drivers/firmware/Kconfig @@ -62,6 +62,15 @@ config EFI_VARS_PSTORE will allow writing console messages, crash dumps, or anything else supported by pstore to EFI variables. +config EFI_VARS_PSTORE_DEFAULT_DISABLE + bool "Disable using efivars as a pstore backend by default" + depends on EFI_VARS_PSTORE + default n + help + Saying Y here will disable the use of efivars as a storage + backend for pstore by default. This setting can be overridden + using the efivars module's pstore_disable parameter. + config EFI_PCDP bool "Console device selection via EFI PCDP or HCDP table" depends on ACPI && EFI && IA64 diff --git a/trunk/drivers/firmware/efivars.c b/trunk/drivers/firmware/efivars.c index 37b6f247399e..6607daf5a08d 100644 --- a/trunk/drivers/firmware/efivars.c +++ b/trunk/drivers/firmware/efivars.c @@ -103,6 +103,11 @@ MODULE_VERSION(EFIVARS_VERSION); */ #define GUID_LEN 36 +static bool efivars_pstore_disable = + IS_ENABLED(EFI_VARS_PSTORE_DEFAULT_DISABLE); + +module_param_named(pstore_disable, efivars_pstore_disable, bool, 0644); + /* * The maximum size of VariableName + Data = 1024 * Therefore, it's reasonable to save that much @@ -2009,7 +2014,8 @@ int register_efivars(struct efivars *efivars, if (error) unregister_efivars(efivars); - efivar_pstore_register(efivars); + if (!efivars_pstore_disable) + efivar_pstore_register(efivars); register_filesystem(&efivarfs_type);