hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Christophe Leroy 2017-08-08 13:59:00 +02:00 committed by Michael Ellerman
parent 3ee87674e0
commit 4915349b10
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/head_8xx.S
View File

@ -595,7 +595,7 @@ DARFixed:/* Return from dcbx instruction bug workaround */
mfspr r5,SPRN_DSISR mfspr r5,SPRN_DSISR
stw r5,_DSISR(r11) stw r5,_DSISR(r11)
mfspr r4,SPRN_DAR mfspr r4,SPRN_DAR
andis. r10,r5,0x4000 andis. r10,r5,DSISR_NOHPTE@h
beq+ 1f beq+ 1f
tlbie r4 tlbie r4
dtlbie: dtlbie:

2
arch/powerpc/mm/fault.c
View File

@ -354,7 +354,7 @@ static void sanity_check_fault(bool is_write, unsigned long error_code) { }
#else #else
#define page_fault_is_write(__err) ((__err) & DSISR_ISSTORE) #define page_fault_is_write(__err) ((__err) & DSISR_ISSTORE)
#if defined(CONFIG_PPC_8xx) #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) #elif defined(CONFIG_PPC64)
#define page_fault_is_bad(__err) ((__err) & DSISR_BAD_FAULT_64S) #define page_fault_is_bad(__err) ((__err) & DSISR_BAD_FAULT_64S)
#else #else