From e85431ecb79d843f560fe399a4db0816d1f465ad Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 11 Sep 2008 17:18:56 +0100
Subject: [PATCH] --- yaml --- r: 109783 b: refs/heads/master c:
 d1c6d2e547148c5aa0c0a4ff6aac82f7c6da1d8b h: refs/heads/master i:   109781:
 02adf6ac7b758fb5e0d2afdd503b17a77d7397bd   109779:
 00ec624fe8431ebd5e864a3eea87faca90480d58   109775:
 bc657af963925bb681ca8498c469b6f02b563c15 v: v3

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

diff --git a/[refs] b/[refs]
index 27632179ce36..5d076e4d08a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d242a263618ba7f0f9a41dd91b347d19e704bbe
+refs/heads/master: d1c6d2e547148c5aa0c0a4ff6aac82f7c6da1d8b
diff --git a/trunk/arch/mn10300/mm/fault.c b/trunk/arch/mn10300/mm/fault.c
index 78f092ca0316..33cf25025dac 100644
--- a/trunk/arch/mn10300/mm/fault.c
+++ b/trunk/arch/mn10300/mm/fault.c
@@ -174,7 +174,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code,
 	 * If we're in an interrupt or have no user
 	 * context, we must not take the fault..
 	 */
-	if (in_interrupt() || !mm)
+	if (in_atomic() || !mm)
 		goto no_context;
 
 	down_read(&mm->mmap_sem);