sh: Provide a dummy _PAGE_WIRED flag for non-X2TLB parts.
authorPaul Mundt <lethal@linux-sh.org>
Tue, 19 Jan 2010 05:23:39 +0000 (14:23 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 19 Jan 2010 05:23:39 +0000 (14:23 +0900)
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>
arch/sh/include/asm/pgtable_32.h

index c573d45f1286c77fd4b10d54acedaf837eb44bc3..e172d696e52bbfaa9e21e6017f343cea7e32d3fd 100644 (file)
@@ -143,12 +143,14 @@ static inline unsigned long copy_ptea_attributes(unsigned long x)
 # elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB)
 #  define _PAGE_SZHUGE (_PAGE_EXT_ESZ2 | _PAGE_EXT_ESZ3)
 # endif
+# define _PAGE_WIRED   (_PAGE_EXT(_PAGE_EXT_WIRED))
 #else
 # if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
 #  define _PAGE_SZHUGE (_PAGE_SZ1)
 # elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
 #  define _PAGE_SZHUGE (_PAGE_SZ0 | _PAGE_SZ1)
 # endif
+# define _PAGE_WIRED   (0)
 #endif
 
 /*
@@ -166,8 +168,6 @@ static inline unsigned long copy_ptea_attributes(unsigned long x)
        (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | \
         _PAGE_DIRTY | _PAGE_SPECIAL)
 
-#define _PAGE_WIRED    (_PAGE_EXT(_PAGE_EXT_WIRED))
-
 #ifndef __ASSEMBLY__
 
 #if defined(CONFIG_X2TLB) /* SH-X2 TLB */