summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm/fault.c
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2017-04-19 14:56:28 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2017-06-02 11:18:34 +0200
commit97a011e69b42bec8ac10f8510d3cd73b50882d88 (patch)
treecc247eb08898ae2f6a0da61ea1cba17ec1f51d40 /arch/powerpc/mm/fault.c
parentpowerpc/mm: Only call store_updates_sp() on stores in do_page_fault() (diff)
downloadlinux-97a011e69b42bec8ac10f8510d3cd73b50882d88.tar.xz
linux-97a011e69b42bec8ac10f8510d3cd73b50882d88.zip
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 <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/fault.c')
-rw-r--r--arch/powerpc/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
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;