diff options
| author |   Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2019-02-15 13:33:33 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2019-02-16 15:02:03 +0100 |
| commit | 582a32e708823e5957fd73ccd78dc4a9e49d21ea (patch) | |
| tree | 313ebeb73e03401253bc62581280cd4327f895b1 /include/linux/efi.h | |
| parent | arm64, mm, efi: Account for GICv3 LPI tables in static memblock reserve table (diff) | |
| download | linux-dev-582a32e708823e5957fd73ccd78dc4a9e49d21ea.tar.xz linux-dev-582a32e708823e5957fd73ccd78dc4a9e49d21ea.zip | |
efi/arm: Revert "Defer persistent reservations until after paging_init()"
This reverts commit eff896288872d687d9662000ec9ae11b6d61766f, which
deferred the processing of persistent memory reservations to a point
where the memory may have already been allocated and overwritten,
defeating the purpose.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190215123333.21209-3-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/efi.h')
| -rw-r--r-- | include/linux/efi.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 45ff763fba76..28604a8d0aa9 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1198,8 +1198,6 @@ 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) { @@ -1218,11 +1216,6 @@ 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); |