diff options
| -rw-r--r-- | arch/sh/include/asm/pgtable.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h index a15f1058bbf4..083ea068e819 100644 --- a/arch/sh/include/asm/pgtable.h +++ b/arch/sh/include/asm/pgtable.h | |||
| @@ -66,7 +66,6 @@ static inline unsigned long long neff_sign_extend(unsigned long val) | |||
| 66 | #define PHYS_ADDR_MASK29 0x1fffffff | 66 | #define PHYS_ADDR_MASK29 0x1fffffff |
| 67 | #define PHYS_ADDR_MASK32 0xffffffff | 67 | #define PHYS_ADDR_MASK32 0xffffffff |
| 68 | 68 | ||
| 69 | #ifdef CONFIG_PMB | ||
| 70 | static inline unsigned long phys_addr_mask(void) | 69 | static inline unsigned long phys_addr_mask(void) |
| 71 | { | 70 | { |
| 72 | /* Is the MMU in 29bit mode? */ | 71 | /* Is the MMU in 29bit mode? */ |
| @@ -75,17 +74,6 @@ static inline unsigned long phys_addr_mask(void) | |||
| 75 | 74 | ||
| 76 | return PHYS_ADDR_MASK32; | 75 | return PHYS_ADDR_MASK32; |
| 77 | } | 76 | } |
| 78 | #elif defined(CONFIG_32BIT) | ||
| 79 | static inline unsigned long phys_addr_mask(void) | ||
| 80 | { | ||
| 81 | return PHYS_ADDR_MASK32; | ||
| 82 | } | ||
| 83 | #else | ||
| 84 | static inline unsigned long phys_addr_mask(void) | ||
| 85 | { | ||
| 86 | return PHYS_ADDR_MASK29; | ||
| 87 | } | ||
| 88 | #endif | ||
| 89 | 77 | ||
| 90 | #define PTE_PHYS_MASK (phys_addr_mask() & PAGE_MASK) | 78 | #define PTE_PHYS_MASK (phys_addr_mask() & PAGE_MASK) |
| 91 | #define PTE_FLAGS_MASK (~(PTE_PHYS_MASK) << PAGE_SHIFT) | 79 | #define PTE_FLAGS_MASK (~(PTE_PHYS_MASK) << PAGE_SHIFT) |
