diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-06 22:42:07 (GMT) |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-06 22:42:07 (GMT) |
commit | 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 (patch) | |
tree | d9dc6f45c9142e6a8f58f1aa8fc75e66f9edd0e9 /arch/s390/mm/fault.c | |
parent | ff89bf3bc0534aa03b5375aa906544d96911bad4 (diff) | |
parent | 8f5bb0438b86d1a5393176ceeec2836fd469edf8 (diff) | |
download | linux-fsl-qoriq-26abd53d8e9e51bbeea0b4772e8dffece3eeff38.tar.xz |
auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/s390/mm/fault.c')
-rw-r--r-- | arch/s390/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 80306bc..75fde94 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -207,7 +207,7 @@ do_exception(struct pt_regs *regs, unsigned long error_code, int is_protection) * we are not in an interrupt and that there is a * user context. */ - if (user_address == 0 || in_interrupt() || !mm) + if (user_address == 0 || in_atomic() || !mm) goto no_context; /* |