[PATCH 1/2] powerpc/mm: Remove duplicated check in do_page_fault()
Gavin Shan
gwshan at linux.vnet.ibm.com
Fri Feb 26 11:26:25 AEDT 2016
When the page fault happened in user space, we need check it's
caused by stack frame pointer update instruction and update
local variable @flag with FAULT_FLAG_USER. Currently, the code
has two separate check for the same condition. That's unnecessary.
This removes one of the duplicated check. No functinal changes
introduced.
Signed-off-by: Gavin Shan <gwshan at linux.vnet.ibm.com>
---
arch/powerpc/mm/fault.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index a67c6d7..935f386 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -294,11 +294,10 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
* can result in fault, which will cause a deadlock when called with
* mmap_sem held
*/
- if (user_mode(regs))
- store_update_sp = store_updates_sp(regs);
-
- if (user_mode(regs))
+ if (user_mode(regs)) {
flags |= FAULT_FLAG_USER;
+ store_update_sp = store_updates_sp(regs);
+ }
/* When running in the kernel we expect faults to occur only to
* addresses in user space. All other faults represent errors in the
--
2.1.0
More information about the Linuxppc-dev
mailing list