diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-04-01 15:10:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-01 15:10:25 +0200 |
| commit | 84a87c628a12f95d8b0c86cc7b8edb28ea5edf90 (patch) | |
| tree | 320a9ecbea3e7899dd933e333d0fb64a7d5b3b11 /drivers/firmware/efi/libstub/efistub.h | |
| parent | e42391cd048809d903291d07f86ed3934ce138e9 (diff) | |
| parent | a643375f4b175569bc3c03c7a3e758f845c1ccd9 (diff) | |
| download | linux-84a87c628a12f95d8b0c86cc7b8edb28ea5edf90.tar.gz linux-84a87c628a12f95d8b0c86cc7b8edb28ea5edf90.tar.bz2 linux-84a87c628a12f95d8b0c86cc7b8edb28ea5edf90.zip | |
Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into core/efi
Pull EFI updates from Matt Fleming:
- Fixes and cleanups for SMBIOS 3.0 DMI code. (Ivan Khoronzhuk)
- A new efi=debug command line option that enables debug output in the
EFI boot stub and results in less verbose EFI memory map output by
default. (Borislav Petkov)
- Disable interrupts around EFI calls and use a more standard page
table saving and restoring idiom when making EFI calls. (Ingo Molnar)
- Reduce the number of memory allocations performed when allocating the
FDT in EFI boot stub by retrieving size from the FDT header in the
EFI config table. (Ard Biesheuvel)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/libstub/efistub.h')
| -rw-r--r-- | drivers/firmware/efi/libstub/efistub.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h index 47437b16b186..e334a01cf92f 100644 --- a/drivers/firmware/efi/libstub/efistub.h +++ b/drivers/firmware/efi/libstub/efistub.h @@ -41,7 +41,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, unsigned long fdt_addr, unsigned long fdt_size); -void *get_fdt(efi_system_table_t *sys_table); +void *get_fdt(efi_system_table_t *sys_table, unsigned long *fdt_size); void efi_get_virtmap(efi_memory_desc_t *memory_map, unsigned long map_size, unsigned long desc_size, efi_memory_desc_t *runtime_map, |