diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-09-25 14:40:08 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-25 14:40:08 (GMT) |
| commit | 29282ac0bd6c0b0c4c893fe2c31863e50fea69f8 (patch) | |
| tree | c04181603b27833abea62e9f396b5f5c26b4067c /arch/x86/include/asm | |
| parent | 0cacbfbeb5077b63d5d3cf6df88b14ac12ad584b (diff) | |
| parent | 115c6628a59044958c205f8468a1b3ba3d539e61 (diff) | |
| download | linux-29282ac0bd6c0b0c4c893fe2c31863e50fea69f8.tar.xz | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fixes from Matt Fleming:
* Revert the static library changes from the merge window since they're
causing issues for Macbooks and Fedora + Grub2 (Matt Fleming)
* Delete the misleading "setup_efi_pci() failed!" message which some
people are seeing when booting EFI (Matt Fleming)
* Fix printing strings from the 32-bit EFI boot stub by only passing
32-bit addresses to the firmware (Matt Fleming)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/efi.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 044a2fd..0ec241e 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -159,30 +159,6 @@ static inline efi_status_t efi_thunk_set_virtual_address_map( } #endif /* CONFIG_EFI_MIXED */ - -/* arch specific definitions used by the stub code */ - -struct efi_config { - u64 image_handle; - u64 table; - u64 allocate_pool; - u64 allocate_pages; - u64 get_memory_map; - u64 free_pool; - u64 free_pages; - u64 locate_handle; - u64 handle_protocol; - u64 exit_boot_services; - u64 text_output; - efi_status_t (*call)(unsigned long, ...); - bool is64; -} __packed; - -extern struct efi_config *efi_early; - -#define efi_call_early(f, ...) \ - efi_early->call(efi_early->f, __VA_ARGS__); - extern bool efi_reboot_required(void); #else |