Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1706430

[PATCH 11/12] powerpc/8xx: Use symbolic names for DSISR bits in DSI

Show all headers | View raw

Use symbolic names for DSISR bits in DSI

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 arch/powerpc/kernel/head_8xx.S | 2 +-
 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 7a218f69f956..6948d0628cde 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -392,7 +392,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
-- 
2.13.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/12] powerpc/8xx: Some cleanup Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:00 +0200
  [PATCH 09/12] powerpc/8xx: remove CONFIG_8xx Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:00 +0200
  [PATCH 12/12] powerpc/8xx: Remove cpu dependent macro instructions  from head_8xx Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:00 +0200
  [PATCH 11/12] powerpc/8xx: Use symbolic names for DSISR bits in DSI Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:00 +0200
  [PATCH 10/12] powerpc/8xx: Use symbolic PVR value Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:10 +0200
  [PATCH 06/12] powerpc/time: refactor MFTB() to limit number of ifdefs Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:10 +0200
  [PATCH 03/12] powerpc/8xx: Remove SoftwareEmulation() Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:10 +0200
  [PATCH 04/12] powerpc/cpm1: link to CONFIG_CPM1 instead of CONFIG_8xx Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:10 +0200
  [PATCH 05/12] powerpc/8xx: Move mpc8xx_pic.c from sysdev to  platform/8xx Christophe Leroy <christophe.leroy@c-s.fr> - 2017-08-08 14:10 +0200

csiph-web