From 97a011e69b42bec8ac10f8510d3cd73b50882d88 Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Wed, 19 Apr 2017 14:56:28 +0200 Subject: [PATCH] powerpc/mm: Remove a redundant test in do_page_fault() The result of (trap == 0x400) is already in is_exec. Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman --- 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 67fefb59d40e..059e762e8995 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -216,7 +216,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.30.2