From 0185466c692f8b73f897d87057f0ae1be4f2c546 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Sat, 4 Jun 2005 15:43:32 -0700
Subject: [PATCH] --- yaml --- r: 1832 b: refs/heads/master c:
 595bf2aacae96d0f87352a1ff5476b79e52e212f h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/s390/mm/fault.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c1f4635719ed..5ae202791196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5c3a6d8fe923b8780b9cd10e72344b8cf8518b5
+refs/heads/master: 595bf2aacae96d0f87352a1ff5476b79e52e212f
diff --git a/trunk/arch/s390/mm/fault.c b/trunk/arch/s390/mm/fault.c
index 80306bc8c799..75fde949d125 100644
--- a/trunk/arch/s390/mm/fault.c
+++ b/trunk/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;
 
 	/*