Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[sfrench/cifs-2.6.git] / arch / sparc / include / asm / pgalloc_64.h

diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
index 9d3e5cc95bbb705c978c535b0cac97151a86c541..264e76ceccf65cfc6a1a002ccc82ff5e8a2f6962 100644 (file)
--- a/arch/sparc/include/asm/pgalloc_64.h
+++ b/arch/sparc/include/asm/pgalloc_64.h
@@ -16,12 +16,12 @@
 
 extern struct kmem_cache *pgtable_cache;
 
-static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
+static inline void __p4d_populate(p4d_t *p4d, pud_t *pud)
 {
-       pgd_set(pgd, pud);
+       p4d_set(p4d, pud);
 }
 
-#define pgd_populate(MM, PGD, PUD)     __pgd_populate(PGD, PUD)
+#define p4d_populate(MM, P4D, PUD)     __p4d_populate(P4D, PUD)
 
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {