Commit 9846d860 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi: gsmi: fix false dependency on CONFIG_EFI_VARS 



The gsmi code does not actually rely on CONFIG_EFI_VARS, since it only
uses the efivars abstraction that is included unconditionally when
CONFIG_EFI is defined. CONFIG_EFI_VARS controls the inclusion of the
code that exposes the sysfs entries, and which has been deprecated for
some time.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 5d3c8617

drivers/firmware/google/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ config GOOGLE_SMI 
	help

	  Say Y here if you want to enable SMI callbacks for Google

	  platforms.  This provides an interface for writing to and

	  clearing the event log.  If EFI_VARS is also enabled this

	  clearing the event log.  If CONFIG_EFI is also enabled this

	  driver provides an interface for reading and writing NVRAM

	  variables.

drivers/firmware/google/gsmi.c

+4 −4
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int gsmi_exec(u8 func, u8 sub) 
	return rc;

}



#ifdef CONFIG_EFI_VARS

#ifdef CONFIG_EFI



static struct efivars efivars;
@@ -483,7 +483,7 @@ static const struct efivar_operations efivar_ops = { 
	.get_next_variable = gsmi_get_next_variable,

};



#endif /* CONFIG_EFI_VARS */

#endif /* CONFIG_EFI */



static ssize_t eventlog_write(struct file *filp, struct kobject *kobj,

			       struct bin_attribute *bin_attr,
@@ -1007,7 +1007,7 @@ static __init int gsmi_init(void) 
		goto out_remove_bin_file;

	}



#ifdef CONFIG_EFI_VARS

#ifdef CONFIG_EFI

	ret = efivars_register(&efivars, &efivar_ops, gsmi_kobj);

	if (ret) {

		printk(KERN_INFO "gsmi: Failed to register efivars\n");
@@ -1047,7 +1047,7 @@ static void __exit gsmi_exit(void) 
	unregister_die_notifier(&gsmi_die_notifier);

	atomic_notifier_chain_unregister(&panic_notifier_list,

					 &gsmi_panic_notifier);

#ifdef CONFIG_EFI_VARS

#ifdef CONFIG_EFI

	efivars_unregister(&efivars);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE