Commit 50d53c58 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi: Drop handling of 'boot_info' configuration table 



Some plumbing exists to handle a UEFI configuration table of type
BOOT_INFO but since we never match it to a GUID anywhere, we never
actually register such a table, or access it, for that matter. So
simply drop all mentions of it.

Tested-by: Tony Luck <tony.luck@intel.com> # arch/ia64
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 79d3219d

arch/x86/platform/efi/efi.c

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static const unsigned long * const efi_tables[] = { 
	&efi.acpi20,

	&efi.smbios,

	&efi.smbios3,

	&efi.boot_info,

	&efi.hcdp,

	&efi.uga,

#ifdef CONFIG_X86_UV

drivers/firmware/efi/efi.c

+0 −3
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct efi __read_mostly efi = { 
	.acpi20			= EFI_INVALID_TABLE_ADDR,

	.smbios			= EFI_INVALID_TABLE_ADDR,

	.smbios3		= EFI_INVALID_TABLE_ADDR,

	.boot_info		= EFI_INVALID_TABLE_ADDR,

	.hcdp			= EFI_INVALID_TABLE_ADDR,

	.uga			= EFI_INVALID_TABLE_ADDR,

	.fw_vendor		= EFI_INVALID_TABLE_ADDR,
@@ -139,8 +138,6 @@ static ssize_t systab_show(struct kobject *kobj, 
		str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);

	if (efi.hcdp != EFI_INVALID_TABLE_ADDR)

		str += sprintf(str, "HCDP=0x%lx\n", efi.hcdp);

	if (efi.boot_info != EFI_INVALID_TABLE_ADDR)

		str += sprintf(str, "BOOTINFO=0x%lx\n", efi.boot_info);

	if (efi.uga != EFI_INVALID_TABLE_ADDR)

		str += sprintf(str, "UGA=0x%lx\n", efi.uga);

include/linux/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -536,7 +536,6 @@ extern struct efi { 
	unsigned long acpi20;		/* ACPI table  (ACPI 2.0) */

	unsigned long smbios;		/* SMBIOS table (32 bit entry point) */

	unsigned long smbios3;		/* SMBIOS table (64 bit entry point) */

	unsigned long boot_info;	/* boot info table */

	unsigned long hcdp;		/* HCDP table */

	unsigned long uga;		/* UGA table */

	unsigned long fw_vendor;	/* fw_vendor */

CRA Git | Maintained and supported by SUSTech CRA and CCSE