[PATCH] efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE

[PATCH] efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 826 bytes --]

The 'CONFIG_' prefix is not implicit in IS_ENABLED().

Signed-off-by: Ben Hutchings <ben-/+tVBieCtBitmTQ+vhA3Yw@public.gmane.org>
Cc: Seth Forshee <seth.forshee-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
---
 drivers/firmware/efivars.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index d64661f..7acafb8 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -104,7 +104,7 @@ MODULE_VERSION(EFIVARS_VERSION);
 #define GUID_LEN 36
 
 static bool efivars_pstore_disable =
-	IS_ENABLED(EFI_VARS_PSTORE_DEFAULT_DISABLE);
+	IS_ENABLED(CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE);
 
 module_param_named(pstore_disable, efivars_pstore_disable, bool, 0644);
 


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH] efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE

[Paul Bolle]

On Fri, 2013-03-22 at 19:56 +0000, Ben Hutchings wrote:
> The 'CONFIG_' prefix is not implicit in IS_ENABLED().

    $ git grep -n "\bIS_ENABLED(" | grep -v "(CONFIG_"
    arch/arm/mach-clps711x/board-autcpu12.c:161:	if (IS_ENABLED(MTD_NAND_GPIO) && IS_ENABLED(GPIO_GENERIC_PLATFORM)) {
    arch/arm64/mm/mmu.c:264:	bool page64k = IS_ENABLED(ARM64_64K_PAGES);
    [...]

Did you check these other three (potential) problems too?


Paul Bolle

Re: [PATCH] efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE

[Matt Fleming]

On 22/03/13 19:56, Ben Hutchings wrote:
> The 'CONFIG_' prefix is not implicit in IS_ENABLED().
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> Cc: Seth Forshee <seth.forshee@canonical.com>
> Cc: <stable@vger.kernel.org>
> ---
>  drivers/firmware/efivars.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied. Thanks for catching this!

Re: [PATCH] efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 686 bytes --]

On Fri, 2013-03-22 at 21:11 +0100, Paul Bolle wrote:
> On Fri, 2013-03-22 at 19:56 +0000, Ben Hutchings wrote:
> > The 'CONFIG_' prefix is not implicit in IS_ENABLED().
> 
>     $ git grep -n "\bIS_ENABLED(" | grep -v "(CONFIG_"
>     arch/arm/mach-clps711x/board-autcpu12.c:161:	if (IS_ENABLED(MTD_NAND_GPIO) && IS_ENABLED(GPIO_GENERIC_PLATFORM)) {
>     arch/arm64/mm/mmu.c:264:	bool page64k = IS_ENABLED(ARM64_64K_PAGES);
>     [...]
> 
> Did you check these other three (potential) problems too?

I found those too, but this one was slightly more urgent for me!

Ben.

-- 
Ben Hutchings
Make three consecutive correct guesses and you will be considered an expert.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH] efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE

[Paul Bolle]

On Fri, 2013-03-22 at 20:18 +0000, Ben Hutchings wrote:
> I found those too[...]!

Great! Would you mind CC-ing me if you find the time to fix these, if
that turns out to be necessary?


Paul Bolle