Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763360AbdDSM7h (ORCPT ); Wed, 19 Apr 2017 08:59:37 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:58604 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934232AbdDSM4d (ORCPT ); Wed, 19 Apr 2017 08:56:33 -0400 Message-Id: <938b8a2050fb08b92a609d78e8a213e2f4146f6d.1492606298.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 3/5] powerpc/mm: remove a redundant test in do_page_fault() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Scott Wood Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Wed, 19 Apr 2017 14:56:28 +0200 (CEST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 698 Lines: 22 The result of (trap == 0x400) is already in is_exec. Signed-off-by: Christophe Leroy --- arch/powerpc/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 9d21e5fd383d..b56bf472db6d 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -213,7 +213,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, * bits we are interested in. But there are some bits which * indicate errors in DSISR but can validly be set in SRR1. */ - if (trap == 0x400) + if (is_exec) error_code &= 0x48200000; else is_write = error_code & DSISR_ISSTORE; -- 2.12.0