From e44d6c4010a4c84369013932eea4721d16cbc08d Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 13 Jan 2010 19:18:39 +0900
Subject: [PATCH] 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>
---
 arch/sh/include/asm/{pgtable_nopmd.h => pgtable-2level.h} | 6 +++---
 arch/sh/include/asm/{pgtable_pmd.h => pgtable-3level.h}   | 6 +++---
 arch/sh/include/asm/pgtable.h                             | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename arch/sh/include/asm/{pgtable_nopmd.h => pgtable-2level.h} (79%)
 rename arch/sh/include/asm/{pgtable_pmd.h => pgtable-3level.h} (92%)

diff --git a/arch/sh/include/asm/pgtable_nopmd.h b/arch/sh/include/asm/pgtable-2level.h
similarity index 79%
rename from arch/sh/include/asm/pgtable_nopmd.h
rename to arch/sh/include/asm/pgtable-2level.h
index b8355e4..19bd89d 100644
--- a/arch/sh/include/asm/pgtable_nopmd.h
+++ b/arch/sh/include/asm/pgtable-2level.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_SH_PGTABLE_NOPMD_H
-#define __ASM_SH_PGTABLE_NOPMD_H
+#ifndef __ASM_SH_PGTABLE_2LEVEL_H
+#define __ASM_SH_PGTABLE_2LEVEL_H
 
 #include <asm-generic/pgtable-nopmd.h>
 
@@ -20,4 +20,4 @@
 #define PTRS_PER_PGD		(PAGE_SIZE / (1 << PTE_MAGNITUDE))
 #define USER_PTRS_PER_PGD	(TASK_SIZE/PGDIR_SIZE)
 
-#endif /* __ASM_SH_PGTABLE_NOPMD_H */
+#endif /* __ASM_SH_PGTABLE_2LEVEL_H */
diff --git a/arch/sh/include/asm/pgtable_pmd.h b/arch/sh/include/asm/pgtable-3level.h
similarity index 92%
rename from arch/sh/include/asm/pgtable_pmd.h
rename to arch/sh/include/asm/pgtable-3level.h
index 587b05e..249a985 100644
--- a/arch/sh/include/asm/pgtable_pmd.h
+++ b/arch/sh/include/asm/pgtable-3level.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_SH_PGTABLE_PMD_H
-#define __ASM_SH_PGTABLE_PMD_H
+#ifndef __ASM_SH_PGTABLE_3LEVEL_H
+#define __ASM_SH_PGTABLE_3LEVEL_H
 
 #include <asm-generic/pgtable-nopud.h>
 
@@ -53,4 +53,4 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
  */
 #define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0)
 
-#endif /* __ASM_SH_PGTABLE_PMD_H */
+#endif /* __ASM_SH_PGTABLE_3LEVEL_H */
diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h
index 856ece0..aab7652 100644
--- 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>
 
-- 
2.7.4