[PATCH] x86_64: Get rid of pud_offset_k / __pud_offset_k

pud_offset_k() equivalent to pud_offset() now.  Pointed out by Jan Beulich
Similar for __pud_offset_ok, which needs a small change in the callers.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 55250593d8c9..64728898f869 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -160,7 +160,7 @@ void dump_pagetable(unsigned long address)
         printk("PGD %lx ", pgd_val(*pgd));
         if (!pgd_present(*pgd)) goto ret; 
 
-        pud = __pud_offset_k((pud_t *)pgd_page(*pgd), address);
+        pud = pud_offset(pgd, address);
         if (bad_address(pud)) goto bad;
         printk("PUD %lx ", pud_val(*pud));
         if (!pud_present(*pud)) goto ret;
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index a70a8e3e312d..b83645a2e02d 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -372,7 +372,7 @@ void __meminit init_memory_mapping(unsigned long start, unsigned long end)
                 pud_t *pud;
 
                 if (after_bootmem)
-                        pud = pud_offset_k(pgd, start & PGDIR_MASK);
+                        pud = pud_offset(pgd, start & PGDIR_MASK);
                 else
                         pud = alloc_low_page(&map, &pud_phys);