sh: Rename split-level pgtable headers.

These were originally named _nopmd and _pmd to follow their asm-generic
counterparts, but we rename them to -2level and -3level for general
consistency.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/include/asm/pgtable-2level.h b/arch/sh/include/asm/pgtable-2level.h
new file mode 100644 (file)
index 0000000..19bd89d
--- /dev/null
+++ b/arch/sh/include/asm/pgtable-2level.h
@@ -0,0 +1,23 @@
+#ifndef __ASM_SH_PGTABLE_2LEVEL_H
+#define __ASM_SH_PGTABLE_2LEVEL_H
+
+#include <asm-generic/pgtable-nopmd.h>
+
+/*
+ * traditional two-level paging structure
+ */
+#define PAGETABLE_LEVELS       2
+
+/* PTE bits */
+#define PTE_MAGNITUDE          2       /* 32-bit PTEs */
+
+#define PTE_SHIFT              PAGE_SHIFT
+#define PTE_BITS               (PTE_SHIFT - PTE_MAGNITUDE)
+
+/* PGD bits */
+#define PGDIR_SHIFT            (PTE_SHIFT + PTE_BITS)
+
+#define PTRS_PER_PGD           (PAGE_SIZE / (1 << PTE_MAGNITUDE))
+#define USER_PTRS_PER_PGD      (TASK_SIZE/PGDIR_SIZE)
+
+#endif /* __ASM_SH_PGTABLE_2LEVEL_H */

diff --git a/arch/sh/include/asm/pgtable-3level.h b/arch/sh/include/asm/pgtable-3level.h
new file mode 100644 (file)
index 0000000..249a985
--- /dev/null
+++ b/arch/sh/include/asm/pgtable-3level.h
@@ -0,0 +1,56 @@
+#ifndef __ASM_SH_PGTABLE_3LEVEL_H
+#define __ASM_SH_PGTABLE_3LEVEL_H
+
+#include <asm-generic/pgtable-nopud.h>
+
+/*
+ * Some cores need a 3-level page table layout, for example when using
+ * 64-bit PTEs and 4K pages.
+ */
+#define PAGETABLE_LEVELS       3
+
+#define PTE_MAGNITUDE          3       /* 64-bit PTEs on SH-X2 TLB */
+
+/* PGD bits */
+#define PGDIR_SHIFT            30
+
+#define PTRS_PER_PGD           4
+#define USER_PTRS_PER_PGD      2
+
+/* PMD bits */
+#define PMD_SHIFT      (PAGE_SHIFT + (PAGE_SHIFT - PTE_MAGNITUDE))
+#define PMD_SIZE       (1UL << PMD_SHIFT)
+#define PMD_MASK       (~(PMD_SIZE-1))
+
+#define PTRS_PER_PMD   ((1 << PGDIR_SHIFT) / PMD_SIZE)
+
+#define pmd_ERROR(e) \
+       printk("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e))
+
+typedef struct { unsigned long long pmd; } pmd_t;
+#define pmd_val(x)     ((x).pmd)
+#define __pmd(x)       ((pmd_t) { (x) } )
+
+static inline unsigned long pud_page_vaddr(pud_t pud)
+{
+       return pud_val(pud);
+}
+
+#define pmd_index(address)     (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
+static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
+{
+       return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address);
+}
+
+#define pud_none(x)    (!pud_val(x))
+#define pud_present(x) (pud_val(x))
+#define pud_clear(xp)  do { set_pud(xp, __pud(0)); } while (0)
+#define        pud_bad(x)      (pud_val(x) & ~PAGE_MASK)
+
+/*
+ * (puds are folded into pgds so this doesn't get actually called,
+ * but the define is needed for a generic inline function.)
+ */
+#define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0)
+
+#endif /* __ASM_SH_PGTABLE_3LEVEL_H */

diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h
index 856ece07d31b3d5daa4121f4cf50724d39f8e309..aab76528abb979fe6d7b0c871aa03efb86396751 100644 (file)
--- a/arch/sh/include/asm/pgtable.h
+++ b/arch/sh/include/asm/pgtable.h
@@ -13,9 +13,9 @@
 #define __ASM_SH_PGTABLE_H
 
 #ifdef CONFIG_X2TLB
-#include <asm/pgtable_pmd.h>
+#include <asm/pgtable-3level.h>
 #else
-#include <asm/pgtable_nopmd.h>
+#include <asm/pgtable-2level.h>
 #endif
 #include <asm/page.h>
 

diff --git a/arch/sh/include/asm/pgtable_nopmd.h b/arch/sh/include/asm/pgtable_nopmd.h
deleted file mode 100644 (file)
index b8355e4..0000000
--- a/arch/sh/include/asm/pgtable_nopmd.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __ASM_SH_PGTABLE_NOPMD_H
-#define __ASM_SH_PGTABLE_NOPMD_H
-
-#include <asm-generic/pgtable-nopmd.h>
-
-/*
- * traditional two-level paging structure
- */
-#define PAGETABLE_LEVELS       2
-
-/* PTE bits */
-#define PTE_MAGNITUDE          2       /* 32-bit PTEs */
-
-#define PTE_SHIFT              PAGE_SHIFT
-#define PTE_BITS               (PTE_SHIFT - PTE_MAGNITUDE)
-
-/* PGD bits */
-#define PGDIR_SHIFT            (PTE_SHIFT + PTE_BITS)
-
-#define PTRS_PER_PGD           (PAGE_SIZE / (1 << PTE_MAGNITUDE))
-#define USER_PTRS_PER_PGD      (TASK_SIZE/PGDIR_SIZE)
-
-#endif /* __ASM_SH_PGTABLE_NOPMD_H */

diff --git a/arch/sh/include/asm/pgtable_pmd.h b/arch/sh/include/asm/pgtable_pmd.h
deleted file mode 100644 (file)
index 587b05e..0000000
--- a/arch/sh/include/asm/pgtable_pmd.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef __ASM_SH_PGTABLE_PMD_H
-#define __ASM_SH_PGTABLE_PMD_H
-
-#include <asm-generic/pgtable-nopud.h>
-
-/*
- * Some cores need a 3-level page table layout, for example when using
- * 64-bit PTEs and 4K pages.
- */
-#define PAGETABLE_LEVELS       3
-
-#define PTE_MAGNITUDE          3       /* 64-bit PTEs on SH-X2 TLB */
-
-/* PGD bits */
-#define PGDIR_SHIFT            30
-
-#define PTRS_PER_PGD           4
-#define USER_PTRS_PER_PGD      2
-
-/* PMD bits */
-#define PMD_SHIFT      (PAGE_SHIFT + (PAGE_SHIFT - PTE_MAGNITUDE))
-#define PMD_SIZE       (1UL << PMD_SHIFT)
-#define PMD_MASK       (~(PMD_SIZE-1))
-
-#define PTRS_PER_PMD   ((1 << PGDIR_SHIFT) / PMD_SIZE)
-
-#define pmd_ERROR(e) \
-       printk("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e))
-
-typedef struct { unsigned long long pmd; } pmd_t;
-#define pmd_val(x)     ((x).pmd)
-#define __pmd(x)       ((pmd_t) { (x) } )
-
-static inline unsigned long pud_page_vaddr(pud_t pud)
-{
-       return pud_val(pud);
-}
-
-#define pmd_index(address)     (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
-static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
-{
-       return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address);
-}
-
-#define pud_none(x)    (!pud_val(x))
-#define pud_present(x) (pud_val(x))
-#define pud_clear(xp)  do { set_pud(xp, __pud(0)); } while (0)
-#define        pud_bad(x)      (pud_val(x) & ~PAGE_MASK)
-
-/*
- * (puds are folded into pgds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0)
-
-#endif /* __ASM_SH_PGTABLE_PMD_H */