diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
| commit | d039ba24f135147f60a13bcaa768189a5b773b6e (patch) | |
| tree | 444b7596ab8312b5954d15c3135052a7c09c6fbe /arch/s390/mm/fault.c | |
| parent | 72e3148a6e987974e3e949c5668e5ca812d7c818 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 80306bc8c799..75fde949d125 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) | |||
| 207 | * we are not in an interrupt and that there is a | 207 | * we are not in an interrupt and that there is a |
| 208 | * user context. | 208 | * user context. |
| 209 | */ | 209 | */ |
| 210 | if (user_address == 0 || in_interrupt() || !mm) | 210 | if (user_address == 0 || in_atomic() || !mm) |
| 211 | goto no_context; | 211 | goto no_context; |
| 212 | 212 | ||
| 213 | /* | 213 | /* |