diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2017-08-08 13:59:00 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-10 23:32:20 +1000 |
| commit | 4915349b1099cb5225a95e265865207030537d92 (patch) | |
| tree | 43f8a2a03b348a773e66f3505827149324eea128 /arch | |
| parent | 3ee87674e0212a152419a479dfb1eed501bab386 (diff) | |
| download | linux-4915349b1099cb5225a95e265865207030537d92.tar.bz2 | |
powerpc/8xx: Use symbolic names for DSISR bits in DSI
Use symbolic names for DSISR bits in DSI
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/head_8xx.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/mm/fault.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 778a0e11d0e6..a1c2a2cfec7e 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -595,7 +595,7 @@ DARFixed:/* Return from dcbx instruction bug workaround */ mfspr r5,SPRN_DSISR stw r5,_DSISR(r11) mfspr r4,SPRN_DAR - andis. r10,r5,0x4000 + andis. r10,r5,DSISR_NOHPTE@h beq+ 1f tlbie r4 dtlbie: diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index f88fac3d281b..4797d08581ce 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -354,7 +354,7 @@ static void sanity_check_fault(bool is_write, unsigned long error_code) { } #else #define page_fault_is_write(__err) ((__err) & DSISR_ISSTORE) #if defined(CONFIG_PPC_8xx) -#define page_fault_is_bad(__err) ((__err) & 0x10000000) +#define page_fault_is_bad(__err) ((__err) & DSISR_NOEXEC_OR_G) #elif defined(CONFIG_PPC64) #define page_fault_is_bad(__err) ((__err) & DSISR_BAD_FAULT_64S) #else |