diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 18:15:37 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 18:15:37 +0000 |
| commit | 994448f1afa6689bafbebaf7412b23b541b41ef5 (patch) | |
| tree | b7460c6a9bdadc6554ad7f0da52b5c60403164c1 /arch/x86/include/asm/pgtable_types.h | |
| parent | 4fd69331ad227a4d8de26592d017b73e00caca9f (diff) | |
| parent | 18c46461d9e42d398536055f31f58cdcd2c6347e (diff) | |
| download | linux-0-day-994448f1afa6689bafbebaf7412b23b541b41ef5.tar.gz linux-0-day-994448f1afa6689bafbebaf7412b23b541b41ef5.tar.xz | |
Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo
Conflicts:
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c
arch/x86/platform/efi/efi_64.c
Diffstat (limited to 'arch/x86/include/asm/pgtable_types.h')
| -rw-r--r-- | arch/x86/include/asm/pgtable_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 94e40f1efdfde..708f19fb4fc78 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -382,6 +382,8 @@ static inline void update_page_count(int level, unsigned long pages) { } * as a pte too. */ extern pte_t *lookup_address(unsigned long address, unsigned int *level); +extern pte_t *lookup_address_in_pgd(pgd_t *pgd, 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); |