diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2011-08-11 15:31:31 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-13 11:01:19 -0500 |
| commit | 6cf839a189e681a1f7a3619c100ff7a293e1ac13 (patch) | |
| tree | 4dc54ab99eab8b4f11a1003afb8266f9b6800952 /arch/s390/mm/fault.c | |
| parent | 9876b802c9938d40895e4bdb10e24b2c0ff6b2e2 (diff) | |
mm: pagefault_disabled()
Wrap the test for pagefault_disabled() into a helper, this allows us
to remove the need for current->pagefault_disabled on !-rt kernels.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-3yy517m8zsi9fpsf14xfaqkw@git.kernel.org
Diffstat (limited to 'arch/s390/mm/fault.c')
| -rw-r--r-- | arch/s390/mm/fault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 6c0edb8d2329..a5c14564ac40 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -283,8 +283,8 @@ static inline int do_exception(struct pt_regs *regs, int access) * user context. */ fault = VM_FAULT_BADCONTEXT; - if (unlikely(!user_space_fault(trans_exc_code) || in_atomic() || !mm || - tsk->pagefault_disabled)) + if (unlikely(!user_space_fault(trans_exc_code) || + !mm || pagefault_disabled())) goto out; address = trans_exc_code & __FAIL_ADDR_MASK; @@ -417,7 +417,7 @@ void __kprobes do_asce_exception(struct pt_regs *regs) trans_exc_code = regs->int_parm_long; if (unlikely(!user_space_fault(trans_exc_code) || in_atomic() || !mm || - current->pagefault_disabled)) + pagefault_disabled())) goto no_context; down_read(&mm->mmap_sem); |