MIPS: Fix RIXI patch for au1000 processors.
PATCH 1/1 MIPS: Fix RIXI patch for au1000 processors.
Several macros need to be defined even though they are only used in dead code paths.
Signed-off-by David Daney <[email protected]>
--- arch/mips/include/asm/pgtable-bits.h | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-)
arch/mips/include/asm/pgtable-bits.h +20 -5
@@ -66,7 +66,6 @@#define _PAGE_SILENT_WRITE (1<<10)#define _CACHE_UNCACHED (1<<11)#define _CACHE_MASK (1<<11) -#define _PFN_SHIFT PAGE_SHIFT#else /* 'Normal' r4K case */ /*
@@ -129,10 +128,26 @@#define _CACHE_MASK (7 << _CACHE_SHIFT)#define _PFN_SHIFT (PAGE_SHIFT - 12 + _CACHE_SHIFT + 3) -#define _PFN_MASK (~((1 << (_PFN_SHIFT)) - 1))#endif /* defined(CONFIG_64BIT_PHYS_ADDR && defined(CONFIG_CPU_MIPS32) */ +#ifndef _PFN_SHIFT +#define _PFN_SHIFT PAGE_SHIFT +#endif +#define _PFN_MASK (~((1 << (_PFN_SHIFT)) - 1)) + +#ifndef _PAGE_NO_READ +#define _PAGE_NO_READ ({BUG(); 0; }) +#define _PAGE_NO_READ_SHIFT ({BUG(); 0; }) +#endif +#ifndef _PAGE_NO_EXEC +#define _PAGE_NO_EXEC ({BUG(); 0; }) +#endif +#ifndef _PAGE_GLOBAL_SHIFT +#define _PAGE_GLOBAL_SHIFT ilog2(_PAGE_GLOBAL) +#endif + +#ifndef __ASSEMBLY__/* * pte_to_entrylo converts a page table entry (PTE) into a Mips
@@ -148,9 +163,9 @@ static inline uint64_t pte_to_entrylo(unsigned long pte_val) sa =63 - _PAGE_NO_READ_SHIFT;#endif /* -* C has no way to express that this is a DSRL 5 -* followed by a ROTR 2. Luckily in the fast path -* this is done in assembly +* C has no way to express that this is a DSRL +* _PAGE_NO_EXEC_SHIFT followed by a ROTR 2. Luckily +* in the fast path this is done in assembly */ return (pte_val >> _PAGE_GLOBAL_SHIFT) | ((pte_val & (_PAGE_NO_EXEC | _PAGE_NO_READ)) << sa);
Signature · 1 line
1.6.6
Quoted 2 lines · David Daney
Several macros need to be defined even though they are only used in dead code paths.
Thanks, folded into the existing patch.
Ralf