diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-19 00:23:39 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-19 00:23:39 -0500 |
commit | 046581f9623b53f551a93864bb74e15ad2514f0c (patch) | |
tree | ea3cf5c2ddd46d01055360560e61eb5b4d4b53f2 /arch/sh/include/asm/pgtable_32.h | |
parent | 6d63e73d520b690e4378cef3003eb5f01f7d128c (diff) |
sh: Provide a dummy _PAGE_WIRED flag for non-X2TLB parts.
This provides a dummy value for legacy parts which permits the entry
wiring to be open-coded. The compiler takes care of optimizing the entry
wiring away in these cases.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/pgtable_32.h')
-rw-r--r-- | arch/sh/include/asm/pgtable_32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/pgtable_32.h b/arch/sh/include/asm/pgtable_32.h index c573d45f1286..e172d696e52b 100644 --- a/arch/sh/include/asm/pgtable_32.h +++ b/arch/sh/include/asm/pgtable_32.h | |||
@@ -143,12 +143,14 @@ static inline unsigned long copy_ptea_attributes(unsigned long x) | |||
143 | # elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB) | 143 | # elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB) |
144 | # define _PAGE_SZHUGE (_PAGE_EXT_ESZ2 | _PAGE_EXT_ESZ3) | 144 | # define _PAGE_SZHUGE (_PAGE_EXT_ESZ2 | _PAGE_EXT_ESZ3) |
145 | # endif | 145 | # endif |
146 | # define _PAGE_WIRED (_PAGE_EXT(_PAGE_EXT_WIRED)) | ||
146 | #else | 147 | #else |
147 | # if defined(CONFIG_HUGETLB_PAGE_SIZE_64K) | 148 | # if defined(CONFIG_HUGETLB_PAGE_SIZE_64K) |
148 | # define _PAGE_SZHUGE (_PAGE_SZ1) | 149 | # define _PAGE_SZHUGE (_PAGE_SZ1) |
149 | # elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB) | 150 | # elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB) |
150 | # define _PAGE_SZHUGE (_PAGE_SZ0 | _PAGE_SZ1) | 151 | # define _PAGE_SZHUGE (_PAGE_SZ0 | _PAGE_SZ1) |
151 | # endif | 152 | # endif |
153 | # define _PAGE_WIRED (0) | ||
152 | #endif | 154 | #endif |
153 | 155 | ||
154 | /* | 156 | /* |
@@ -166,8 +168,6 @@ static inline unsigned long copy_ptea_attributes(unsigned long x) | |||
166 | (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | \ | 168 | (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | \ |
167 | _PAGE_DIRTY | _PAGE_SPECIAL) | 169 | _PAGE_DIRTY | _PAGE_SPECIAL) |
168 | 170 | ||
169 | #define _PAGE_WIRED (_PAGE_EXT(_PAGE_EXT_WIRED)) | ||
170 | |||
171 | #ifndef __ASSEMBLY__ | 171 | #ifndef __ASSEMBLY__ |
172 | 172 | ||
173 | #if defined(CONFIG_X2TLB) /* SH-X2 TLB */ | 173 | #if defined(CONFIG_X2TLB) /* SH-X2 TLB */ |