Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+8 -8
+2 -2
arch/sh/include/asm/pgtable.h
··· 13 13 #define __ASM_SH_PGTABLE_H 14 14 15 15 #ifdef CONFIG_X2TLB 16 - #include <asm/pgtable_pmd.h> 16 + #include <asm/pgtable-3level.h> 17 17 #else 18 - #include <asm/pgtable_nopmd.h> 18 + #include <asm/pgtable-2level.h> 19 19 #endif 20 20 #include <asm/page.h> 21 21
+3 -3
arch/sh/include/asm/pgtable_nopmd.h arch/sh/include/asm/pgtable-2level.h
··· 1 - #ifndef __ASM_SH_PGTABLE_NOPMD_H 2 - #define __ASM_SH_PGTABLE_NOPMD_H 1 + #ifndef __ASM_SH_PGTABLE_2LEVEL_H 2 + #define __ASM_SH_PGTABLE_2LEVEL_H 3 3 4 4 #include <asm-generic/pgtable-nopmd.h> 5 5 ··· 20 20 #define PTRS_PER_PGD (PAGE_SIZE / (1 << PTE_MAGNITUDE)) 21 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 */
+3 -3
arch/sh/include/asm/pgtable_pmd.h arch/sh/include/asm/pgtable-3level.h
··· 1 - #ifndef __ASM_SH_PGTABLE_PMD_H 2 - #define __ASM_SH_PGTABLE_PMD_H 1 + #ifndef __ASM_SH_PGTABLE_3LEVEL_H 2 + #define __ASM_SH_PGTABLE_3LEVEL_H 3 3 4 4 #include <asm-generic/pgtable-nopud.h> 5 5 ··· 53 53 */ 54 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 */