diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-18 10:52:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-18 10:52:26 -0800 |
| commit | 743a4863fddc4fdd591e1cbf4157e981a71b0f09 (patch) | |
| tree | 13674728a7d2b80acf8aa6f27d085e58be01db2e /include | |
| parent | Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
| parent | efi: Permit calling efi_mem_reserve_persistent() from atomic context (diff) | |
| download | linux-dev-743a4863fddc4fdd591e1cbf4157e981a71b0f09.tar.xz linux-dev-743a4863fddc4fdd591e1cbf4157e981a71b0f09.zip | |
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"Misc fixes: two warning splat fixes, a leak fix and persistent memory
allocation fixes for ARM"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi: Permit calling efi_mem_reserve_persistent() from atomic context
efi/arm: Defer persistent reservations until after paging_init()
efi/arm/libstub: Pack FDT after populating it
efi/arm: Revert deferred unmap of early memmap mapping
efi: Fix debugobjects warning on 'efi_rts_work'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 845174e113ce..100ce4a4aff6 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1167,6 +1167,8 @@ static inline bool efi_enabled(int feature) extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); extern bool efi_is_table_address(unsigned long phys_addr); + +extern int efi_apply_persistent_mem_reservations(void); #else static inline bool efi_enabled(int feature) { @@ -1185,6 +1187,11 @@ static inline bool efi_is_table_address(unsigned long phys_addr) { return false; } + +static inline int efi_apply_persistent_mem_reservations(void) +{ + return 0; +} #endif extern int efi_status_to_err(efi_status_t status); |