OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8de85c
)
powerpc/mm: Remove a redundant test in do_page_fault()
author
Christophe Leroy
<christophe.leroy@c-s.fr>
Wed, 19 Apr 2017 12:56:28 +0000
(14:56 +0200)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Fri, 2 Jun 2017 09:18:34 +0000
(19:18 +1000)
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>
arch/powerpc/mm/fault.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/mm/fault.c
b/arch/powerpc/mm/fault.c
index
67fefb5
..
059e762
100644
(file)
--- 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;