diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-08 10:45:45 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-08 10:45:45 -0400 |
| commit | 364f6c717deef4a3ac4982e670fa9846b43cd060 (patch) | |
| tree | 47e3967d6e2220130f2c070e300c97709143b28f /arch/s390/mm/fault.c | |
| parent | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (diff) | |
| parent | 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git
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 | /* |