v3.18.117-rt105 rt-stable review patch. If anyone has any objections,
please let me know.
------------------
From: Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx>
stable-rt commit 7be67fb433a0 ("mm: pagefault_disabled()") does this for s390:
- if (unlikely(!user_space_fault(regs) || in_atomic() || !mm ||
+ if (unlikely(!user_space_fault(regs) || !mm ||
tsk->pagefault_disabled))
whereas elsewhere it does the right thing for other arches e.g.:
- if (in_atomic() || !mm || current->pagefault_disabled)
+ if (!mm || pagefault_disabled())
i.e. because of the linebreak it misses the tsk->pagefault_disabled
and leaves it unconverted.
So fix that up and use pagefault_disabled() as intended.
Signed-off-by: Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx>
---
arch/s390/mm/fault.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 43ec237a17e2..466154e1dfc0 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -436,7 +436,7 @@ static inline int do_exception(struct pt_regs *regs, int access)
*/
fault = VM_FAULT_BADCONTEXT;
if (unlikely(!user_space_fault(regs) || !mm ||
- tsk->pagefault_disabled))
+ pagefault_disabled()))
goto out;
address = trans_exc_code & __FAIL_ADDR_MASK;
--
2.14.1
