Skip to content

Commit

Permalink
sh: Rename split-level pgtable headers.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Jan 13, 2010
1 parent 782bb5a commit e44d6c4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -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>

Expand All @@ -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 */
Original file line number Diff line number Diff line change
@@ -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>

Expand Down Expand Up @@ -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 */
4 changes: 2 additions & 2 deletions arch/sh/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit e44d6c4

Please sign in to comment.