diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:43 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:43 -0500 |
commit | f0646e43acb18f0e00b00085dc88bc3f403e7930 (patch) | |
tree | c47968a44ac541854929f03d22cf2fb76d76cb55 /include/asm-x86 | |
parent | a5a5dc31794c3271c066835ad2c90c58a3805569 (diff) |
x86: return the page table level in lookup_address()
based on this patch from Andi Kleen:
| Subject: CPA: Return the page table level in lookup_address()
| From: Andi Kleen <ak@suse.de>
|
| Needed for the next change.
|
| And change all the callers.
and ported it to x86.git.
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/pgtable_32.h | 2 | ||||
-rw-r--r-- | include/asm-x86/pgtable_64.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h index eb8cccfa6a49..9381bd37b9b1 100644 --- a/include/asm-x86/pgtable_32.h +++ b/include/asm-x86/pgtable_32.h | |||
@@ -182,7 +182,7 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) | |||
182 | * NOTE: the return type is pte_t but if the pmd is PSE then we return it | 182 | * NOTE: the return type is pte_t but if the pmd is PSE then we return it |
183 | * as a pte too. | 183 | * as a pte too. |
184 | */ | 184 | */ |
185 | extern pte_t *lookup_address(unsigned long address); | 185 | extern pte_t *lookup_address(unsigned long address, int *level); |
186 | 186 | ||
187 | /* | 187 | /* |
188 | * Make a given kernel text page executable/non-executable. | 188 | * Make a given kernel text page executable/non-executable. |
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index 29fdeb8111bb..139da50cd510 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h | |||
@@ -240,7 +240,7 @@ extern struct list_head pgd_list; | |||
240 | 240 | ||
241 | extern int kern_addr_valid(unsigned long addr); | 241 | extern int kern_addr_valid(unsigned long addr); |
242 | 242 | ||
243 | pte_t *lookup_address(unsigned long addr); | 243 | pte_t *lookup_address(unsigned long addr, int *level); |
244 | 244 | ||
245 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | 245 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ |
246 | remap_pfn_range(vma, vaddr, pfn, size, prot) | 246 | remap_pfn_range(vma, vaddr, pfn, size, prot) |