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>

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index e6184735545f..45aa771e73a9 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -58,7 +58,8 @@
 
 xmaddr_t arbitrary_virt_to_machine(unsigned long address)
 {
-        pte_t *pte = lookup_address(address);
+        int level;
+        pte_t *pte = lookup_address(address, &level);
         unsigned offset = address & PAGE_MASK;
 
         BUG_ON(pte == NULL);
@@ -70,8 +71,9 @@ void make_lowmem_page_readonly(void *vaddr)
 {
         pte_t *pte, ptev;
         unsigned long address = (unsigned long)vaddr;
+        int level;
 
-        pte = lookup_address(address);
+        pte = lookup_address(address, &level);
         BUG_ON(pte == NULL);
 
         ptev = pte_wrprotect(*pte);
@@ -84,8 +86,9 @@ void make_lowmem_page_readwrite(void *vaddr)
 {
         pte_t *pte, ptev;
         unsigned long address = (unsigned long)vaddr;
+        int level;
 
-        pte = lookup_address(address);
+        pte = lookup_address(address, &level);
         BUG_ON(pte == NULL);
 
         ptev = pte_mkwrite(*pte);