diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-12-15 10:59:03 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-12-15 10:59:03 +0000 |
| commit | 129b985cc3f331d0e6908958f50757a3a1b37793 (patch) | |
| tree | 310de459f120ca99eaa30127a517212a16dccfd6 /arch/arm64/include/asm | |
| parent | 32d6397805d00573ce1fa55f408ce2bca15b0ad3 (diff) | |
| parent | f7d924894265794f447ea799dd853400749b5a22 (diff) | |
Merge branch 'aarch64/efi' into aarch64/for-next/core
Merge in EFI memblock changes from Ard, which form the preparatory work
for UEFI support on 32-bit ARM.
Diffstat (limited to 'arch/arm64/include/asm')
| -rw-r--r-- | arch/arm64/include/asm/efi.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index ef572206f1c3..8e88a696c9cb 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -2,7 +2,9 @@ #define _ASM_EFI_H #include <asm/io.h> +#include <asm/mmu_context.h> #include <asm/neon.h> +#include <asm/tlbflush.h> #ifdef CONFIG_EFI extern void efi_init(void); @@ -10,6 +12,8 @@ extern void efi_init(void); #define efi_init() #endif +int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); + #define efi_call_virt(f, ...) \ ({ \ efi_##f##_t *__f; \ @@ -63,6 +67,11 @@ extern void efi_init(void); * Services are enabled and the EFI_RUNTIME_SERVICES bit set. */ +static inline void efi_set_pgd(struct mm_struct *mm) +{ + switch_mm(NULL, mm, NULL); +} + void efi_virtmap_load(void); void efi_virtmap_unload(void); |