aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:34:04 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:34:04 -0500
commit0a663088cd6ff9e89f285ae7689e6eee46cfb54c (patch)
tree82125b77ca75df9c1869e5de6631e9cb1f162be6
parente4b71dcf54fa90fc30fb901bbce7e38a46467af7 (diff)
x86: clean up lookup_address() declarations
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/asm-x86/pgtable.h8
-rw-r--r--include/asm-x86/pgtable_32.h8
-rw-r--r--include/asm-x86/pgtable_64.h2
3 files changed, 8 insertions, 10 deletions
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h
index 2726ddc457fd..4409dabe31c6 100644
--- a/include/asm-x86/pgtable.h
+++ b/include/asm-x86/pgtable.h
@@ -234,6 +234,14 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
234 234
235#ifndef __ASSEMBLY__ 235#ifndef __ASSEMBLY__
236 236
237/*
238 * Helper function that returns the kernel pagetable entry controlling
239 * the virtual address 'address'. NULL means no pagetable entry present.
240 * NOTE: the return type is pte_t but if the pmd is PSE then we return it
241 * as a pte too.
242 */
243extern pte_t *lookup_address(unsigned long address, int *level);
244
237/* local pte updates need not use xchg for locking */ 245/* local pte updates need not use xchg for locking */
238static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep) 246static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)
239{ 247{
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h
index 72eb06c2bac9..ca7b150ca8b7 100644
--- a/include/asm-x86/pgtable_32.h
+++ b/include/asm-x86/pgtable_32.h
@@ -176,14 +176,6 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
176#define pmd_page_vaddr(pmd) \ 176#define pmd_page_vaddr(pmd) \
177 ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) 177 ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
178 178
179/*
180 * Helper function that returns the kernel pagetable entry controlling
181 * the virtual address 'address'. NULL means no pagetable entry present.
182 * NOTE: the return type is pte_t but if the pmd is PSE then we return it
183 * as a pte too.
184 */
185extern pte_t *lookup_address(unsigned long address, int *level);
186
187#if defined(CONFIG_HIGHPTE) 179#if defined(CONFIG_HIGHPTE)
188#define pte_offset_map(dir, address) \ 180#define pte_offset_map(dir, address) \
189 ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)),KM_PTE0) + pte_index(address)) 181 ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)),KM_PTE0) + pte_index(address))
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h
index faa6a96c2a5c..ce1dbab75e39 100644
--- a/include/asm-x86/pgtable_64.h
+++ b/include/asm-x86/pgtable_64.h
@@ -245,8 +245,6 @@ extern struct list_head pgd_list;
245 245
246extern int kern_addr_valid(unsigned long addr); 246extern int kern_addr_valid(unsigned long addr);
247 247
248pte_t *lookup_address(unsigned long addr, int *level);
249
250#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 248#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
251 remap_pfn_range(vma, vaddr, pfn, size, prot) 249 remap_pfn_range(vma, vaddr, pfn, size, prot)
252 250