mm: consolidate pgtable_cache_init() and pgd_cache_init()

[linux-2.6-block.git] / arch / arm64 / mm / pgd.c

diff --git a/arch/arm64/mm/pgd.c b/arch/arm64/mm/pgd.c
index 9a0c7d5090d6fb007117c217c599dc1a59bf8fce..4a64089e5771c1e2fd06448fe6c0edfb7f5ab635 100644 (file)
--- a/arch/arm64/mm/pgd.c
+++ b/arch/arm64/mm/pgd.c
@@ -19,10 +19,12 @@ static struct kmem_cache *pgd_cache __ro_after_init;
 
 pgd_t *pgd_alloc(struct mm_struct *mm)
 {
+       gfp_t gfp = GFP_PGTABLE_USER;
+
        if (PGD_SIZE == PAGE_SIZE)
-               return (pgd_t *)__get_free_page(PGALLOC_GFP);
+               return (pgd_t *)__get_free_page(gfp);
        else
-               return kmem_cache_alloc(pgd_cache, PGALLOC_GFP);
+               return kmem_cache_alloc(pgd_cache, gfp);
 }
 
 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
@@ -33,7 +35,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd)
                kmem_cache_free(pgd_cache, pgd);
 }
 
-void __init pgd_cache_init(void)
+void __init pgtable_cache_init(void)
 {
        if (PGD_SIZE == PAGE_SIZE)
                return;