diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-11-26 12:23:04 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-11-26 12:23:04 +0100 |
commit | 61d066977583803d333f1e7266b8ba772162dda4 (patch) | |
tree | 087d56e401422f1a8a165a782216aa6d0291a60e /arch/x86/include/asm/pgtable_types.h | |
parent | b975dc3689fc6a3718ad288ce080924f9cb7e176 (diff) | |
parent | ee41143027706d9f342dfe05487a00b20887fde7 (diff) |
Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/efi
Pull EFI virtual mapping changes from Matt Fleming:
* New static EFI runtime services virtual mapping layout which is
groundwork for kexec support on EFI. (Borislav Petkov)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/pgtable_types.h')
-rw-r--r-- | arch/x86/include/asm/pgtable_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 0ecac257fb26..a83aa44bb1fb 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -382,7 +382,8 @@ static inline void update_page_count(int level, unsigned long pages) { } */ extern pte_t *lookup_address(unsigned long address, unsigned int *level); extern phys_addr_t slow_virt_to_phys(void *__address); - +extern int kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address, + unsigned numpages, unsigned long page_flags); #endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_PGTABLE_DEFS_H */ |