From e966604032a1a60e700f97cd392d69614c4a00f2 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Jan 2008 13:34:04 +0100 Subject: [PATCH] --- yaml --- r: 80497 b: refs/heads/master c: 0a663088cd6ff9e89f285ae7689e6eee46cfb54c h: refs/heads/master i: 80495: 3ff01ccadad051b5056072bd74ed594fc1ac38e9 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/pgtable.h | 8 ++++++++ trunk/include/asm-x86/pgtable_32.h | 8 -------- trunk/include/asm-x86/pgtable_64.h | 2 -- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ea12904e35fe..9887488f2b29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4b71dcf54fa90fc30fb901bbce7e38a46467af7 +refs/heads/master: 0a663088cd6ff9e89f285ae7689e6eee46cfb54c diff --git a/trunk/include/asm-x86/pgtable.h b/trunk/include/asm-x86/pgtable.h index 2726ddc457fd..4409dabe31c6 100644 --- a/trunk/include/asm-x86/pgtable.h +++ b/trunk/include/asm-x86/pgtable.h @@ -234,6 +234,14 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) #ifndef __ASSEMBLY__ +/* + * Helper function that returns the kernel pagetable entry controlling + * the virtual address 'address'. NULL means no pagetable entry present. + * NOTE: the return type is pte_t but if the pmd is PSE then we return it + * as a pte too. + */ +extern pte_t *lookup_address(unsigned long address, int *level); + /* local pte updates need not use xchg for locking */ static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep) { diff --git a/trunk/include/asm-x86/pgtable_32.h b/trunk/include/asm-x86/pgtable_32.h index 72eb06c2bac9..ca7b150ca8b7 100644 --- a/trunk/include/asm-x86/pgtable_32.h +++ b/trunk/include/asm-x86/pgtable_32.h @@ -176,14 +176,6 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) #define pmd_page_vaddr(pmd) \ ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) -/* - * Helper function that returns the kernel pagetable entry controlling - * the virtual address 'address'. NULL means no pagetable entry present. - * NOTE: the return type is pte_t but if the pmd is PSE then we return it - * as a pte too. - */ -extern pte_t *lookup_address(unsigned long address, int *level); - #if defined(CONFIG_HIGHPTE) #define pte_offset_map(dir, address) \ ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)),KM_PTE0) + pte_index(address)) diff --git a/trunk/include/asm-x86/pgtable_64.h b/trunk/include/asm-x86/pgtable_64.h index faa6a96c2a5c..ce1dbab75e39 100644 --- a/trunk/include/asm-x86/pgtable_64.h +++ b/trunk/include/asm-x86/pgtable_64.h @@ -245,8 +245,6 @@ extern struct list_head pgd_list; extern int kern_addr_valid(unsigned long addr); -pte_t *lookup_address(unsigned long addr, int *level); - #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ remap_pfn_range(vma, vaddr, pfn, size, prot)