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
Showing the changes to include (2 of 7 files). Show all
Unified · Split
| @@ -1198,8 +1198,6 @@ static inline bool efi_enabled(int feature) · 1197 unmodified lines | ||
| 1198 | 1198 | extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); |
| 1199 | 1199 | |
| 1200 | 1200 | extern bool efi_is_table_address(unsigned long phys_addr); |
| 1201 | − | |
| 1202 | −extern int efi_apply_persistent_mem_reservations(void); | |
| 1203 | 1201 | #else |
| 1204 | 1202 | static 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 | 1217 | return false; |
| 1220 | 1218 | } |
| 1221 | − | |
| 1222 | −static inline int efi_apply_persistent_mem_reservations(void) | |
| 1223 | −{ | |
| 1224 | − return 0; | |
| 1225 | −} | |
| 1226 | 1219 | #endif |
| 1227 | 1220 | |
| 1228 | 1221 | extern int efi_status_to_err(efi_status_t status); |
| @@ -29,9 +29,6 @@ extern unsigned long max_pfn; · 28 unmodified lines | ||
| 29 | 29 | */ |
| 30 | 30 | extern unsigned long long max_possible_pfn; |
| 31 | 31 | |
| 32 | −#define INIT_MEMBLOCK_REGIONS 128 | |
| 33 | −#define INIT_PHYSMEM_REGIONS 4 | |
| 34 | − | |
| 35 | 32 | /** |
| 36 | 33 | * enum memblock_flags - definition of memory region attributes |
| 37 | 34 | * @MEMBLOCK_NONE: no special request |