Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752455AbdHHL7F (ORCPT ); Tue, 8 Aug 2017 07:59:05 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:3871 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752390AbdHHL7C (ORCPT ); Tue, 8 Aug 2017 07:59:02 -0400 Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 11/12] powerpc/8xx: Use symbolic names for DSISR bits in DSI To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Scott Wood Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 8 Aug 2017 13:59:00 +0200 (CEST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1241 Lines: 36 Use symbolic names for DSISR bits in DSI Signed-off-by: Christophe Leroy --- 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