History

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull EFI fixes from Ingo Molnar: "This tree reverts a GICv3 commit (which was broken) and fixes it in another way, by adding a memblock build-time entries quirk for ARM64" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/arm: Revert "Defer persistent reservations until after paging_init()" arm64, mm, efi: Account for GICv3 LPI tables in static memblock reserve table

Linus Torvalds committed 7 years ago

Commit 2fee0362 parents 8d33316 582a32e7 files · +20 −20Browse files

Showing the changes to include (2 of 7 files). Show all

Unified · Split

2 files
  1. include/linux/efi.h +0 −7
  2. include/linux/memblock.h +0 −3
include/linux/efi.h+0−7
@@ -1198,8 +1198,6 @@ static inline bool efi_enabled(int feature) · 1197 unmodified lines
1198extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);1198extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
1199 1199
1200extern bool efi_is_table_address(unsigned long phys_addr);1200extern bool efi_is_table_address(unsigned long phys_addr);
1201
1202extern int efi_apply_persistent_mem_reservations(void);
1203#else1201#else
1204static inline bool efi_enabled(int feature)1202static inline bool efi_enabled(int feature)
1205{1203{
@@ -1218,11 +1216,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr) · 12 unmodified lines
1218{1216{
1219 return false;1217 return false;
1220}1218}
1221
1222static inline int efi_apply_persistent_mem_reservations(void)
1223{
1224 return 0;
1225}
1226#endif1219#endif
1227 1220
1228extern int efi_status_to_err(efi_status_t status);1221extern int efi_status_to_err(efi_status_t status);
include/linux/memblock.h+0−3
@@ -29,9 +29,6 @@ extern unsigned long max_pfn; · 28 unmodified lines
29 */29 */
30extern unsigned long long max_possible_pfn;30extern unsigned long long max_possible_pfn;
31 31
32#define INIT_MEMBLOCK_REGIONS 128
33#define INIT_PHYSMEM_REGIONS 4
34
35/**32/**
36 * enum memblock_flags - definition of memory region attributes33 * enum memblock_flags - definition of memory region attributes
37 * @MEMBLOCK_NONE: no special request34 * @MEMBLOCK_NONE: no special request