diff options
-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 @@ | |||
1 | #ifndef __ASM_SH_PGTABLE_NOPMD_H | 1 | #ifndef __ASM_SH_PGTABLE_2LEVEL_H |
2 | #define __ASM_SH_PGTABLE_NOPMD_H | 2 | #define __ASM_SH_PGTABLE_2LEVEL_H |
3 | 3 | ||
4 | #include <asm-generic/pgtable-nopmd.h> | 4 | #include <asm-generic/pgtable-nopmd.h> |
5 | 5 | ||
@@ -20,4 +20,4 @@ | |||
20 | #define PTRS_PER_PGD (PAGE_SIZE / (1 << PTE_MAGNITUDE)) | 20 | #define PTRS_PER_PGD (PAGE_SIZE / (1 << PTE_MAGNITUDE)) |
21 | #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) | 21 | #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) |
22 | 22 | ||
23 | #endif /* __ASM_SH_PGTABLE_NOPMD_H */ | 23 | #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 @@ | |||
1 | #ifndef __ASM_SH_PGTABLE_PMD_H | 1 | #ifndef __ASM_SH_PGTABLE_3LEVEL_H |
2 | #define __ASM_SH_PGTABLE_PMD_H | 2 | #define __ASM_SH_PGTABLE_3LEVEL_H |
3 | 3 | ||
4 | #include <asm-generic/pgtable-nopud.h> | 4 | #include <asm-generic/pgtable-nopud.h> |
5 | 5 | ||
@@ -53,4 +53,4 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) | |||
53 | */ | 53 | */ |
54 | #define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0) | 54 | #define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0) |
55 | 55 | ||
56 | #endif /* __ASM_SH_PGTABLE_PMD_H */ | 56 | #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 @@ | |||
13 | #define __ASM_SH_PGTABLE_H | 13 | #define __ASM_SH_PGTABLE_H |
14 | 14 | ||
15 | #ifdef CONFIG_X2TLB | 15 | #ifdef CONFIG_X2TLB |
16 | #include <asm/pgtable_pmd.h> | 16 | #include <asm/pgtable-3level.h> |
17 | #else | 17 | #else |
18 | #include <asm/pgtable_nopmd.h> | 18 | #include <asm/pgtable-2level.h> |
19 | #endif | 19 | #endif |
20 | #include <asm/page.h> | 20 | #include <asm/page.h> |
21 | 21 | ||