Commit d4f77435 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/efi 



Pull EFI build fix from Matt Fleming:

  - Fix ESRT build breakage on ia64 reported by Guenter Roeck. (Peter Jones)

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6b33033c 3846c158

drivers/firmware/efi/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ config EFI_VARS 
	  Subsequent efibootmgr releases may be found at:

	  <http://github.com/vathpela/efibootmgr>



config EFI_ESRT

	bool

	depends on EFI && !IA64

	default y



config EFI_VARS_PSTORE

	tristate "Register efivars backend for pstore"

	depends on EFI_VARS && PSTORE

drivers/firmware/efi/Makefile

+2 −1
Original line number Diff line number Diff line 
#

# Makefile for linux kernel

#

obj-$(CONFIG_EFI)			+= efi.o esrt.o vars.o reboot.o

obj-$(CONFIG_EFI)			+= efi.o vars.o reboot.o

obj-$(CONFIG_EFI_VARS)			+= efivars.o

obj-$(CONFIG_EFI_ESRT)			+= esrt.o

obj-$(CONFIG_EFI_VARS_PSTORE)		+= efi-pstore.o

obj-$(CONFIG_UEFI_CPER)			+= cper.o

obj-$(CONFIG_EFI_RUNTIME_MAP)		+= runtime-map.o

include/linux/efi.h

+4 −0
Original line number Diff line number Diff line
@@ -879,7 +879,11 @@ static inline efi_status_t efi_query_variable_store(u32 attributes, unsigned lon 
#endif

extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);

extern int efi_config_init(efi_config_table_type_t *arch_tables);

#ifdef CONFIG_EFI_ESRT

extern void __init efi_esrt_init(void);

#else

static inline void efi_esrt_init(void) { }

#endif

extern int efi_config_parse_tables(void *config_tables, int count, int sz,

				   efi_config_table_type_t *arch_tables);

extern u64 efi_get_iobase (void);