parisc: Rename PMD_ORDER to PMD_TABLE_ORDER

This is the order of the page table allocation, not the order of a PMD.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
index 6a7e98e71f1d337a5fc2dbf2550e43c030ce437e..54b63374579b3e57065b8f255aa4b66be2b50599 100644 (file)
--- a/arch/parisc/include/asm/pgalloc.h
+++ b/arch/parisc/include/asm/pgalloc.h
@@ -48,15 +48,15 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
 {
        pmd_t *pmd;
 
-       pmd = (pmd_t *)__get_free_pages(GFP_PGTABLE_KERNEL, PMD_ORDER);
+       pmd = (pmd_t *)__get_free_pages(GFP_PGTABLE_KERNEL, PMD_TABLE_ORDER);
        if (likely(pmd))
-               memset ((void *)pmd, 0, PAGE_SIZE << PMD_ORDER);
+               memset ((void *)pmd, 0, PAGE_SIZE << PMD_TABLE_ORDER);
        return pmd;
 }
 
 static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
 {
-       free_pages((unsigned long)pmd, PMD_ORDER);
+       free_pages((unsigned long)pmd, PMD_TABLE_ORDER);
 }
 #endif
 

diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index 43937af127b111a7e500d0e89af86bb0908b93a5..7badd872f05ac79a907640547741a1dfbb546782 100644 (file)
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -112,7 +112,7 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
 #define KERNEL_INITIAL_SIZE    (1 << KERNEL_INITIAL_ORDER)
 
 #if CONFIG_PGTABLE_LEVELS == 3
-#define PMD_ORDER      1
+#define PMD_TABLE_ORDER        1
 #define PGD_ORDER      0
 #else
 #define PGD_ORDER      1
@@ -131,7 +131,7 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
 #define PMD_SHIFT       (PLD_SHIFT + BITS_PER_PTE)
 #define PMD_SIZE       (1UL << PMD_SHIFT)
 #define PMD_MASK       (~(PMD_SIZE-1))
-#define BITS_PER_PMD   (PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY)
+#define BITS_PER_PMD   (PAGE_SHIFT + PMD_TABLE_ORDER - BITS_PER_PMD_ENTRY)
 #define PTRS_PER_PMD    (1UL << BITS_PER_PMD)
 #else
 #define BITS_PER_PMD   0

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 591a4e939415374c5234a9f747057175b84b7ace..3f7d6d5b56ac8918881246be2cae6726484616d6 100644 (file)
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -378,8 +378,8 @@ static void __init map_pages(unsigned long start_vaddr,
 
 #if CONFIG_PGTABLE_LEVELS == 3
                if (pud_none(*pud)) {
-                       pmd = memblock_alloc(PAGE_SIZE << PMD_ORDER,
-                                            PAGE_SIZE << PMD_ORDER);
+                       pmd = memblock_alloc(PAGE_SIZE << PMD_TABLE_ORDER,
+                                            PAGE_SIZE << PMD_TABLE_ORDER);
                        if (!pmd)
                                panic("pmd allocation failed.\n");
                        pud_populate(NULL, pud, pmd);