diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-13 13:18:39 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-13 13:18:39 +0300 |
| commit | e44d6c4010a4c84369013932eea4721d16cbc08d (patch) | |
| tree | 8a5decf88a368edf92cfea1a6ae7cb166009dc43 | |
| parent | 782bb5a532f883540bf403afb19f735a4eefd95b (diff) | |
| download | linux-e44d6c4010a4c84369013932eea4721d16cbc08d.tar.xz | |
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>
| -rw-r--r-- | arch/sh/include/asm/pgtable-2level.h (renamed from arch/sh/include/asm/pgtable_nopmd.h) | 6 | ||||
| -rw-r--r-- | arch/sh/include/asm/pgtable-3level.h (renamed from arch/sh/include/asm/pgtable_pmd.h) | 6 | ||||
| -rw-r--r-- | arch/sh/include/asm/pgtable.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/sh/include/asm/pgtable_nopmd.h b/arch/sh/include/asm/pgtable-2level.h index b8355e4057cf..19bd89db17e7 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 index 587b05e1d04f..249a985d9648 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 856ece07d31b..aab76528abb9 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> |