From 306fc75bda8dcc098d0ee052e11a90f22a7f35c2 Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Wed, 4 Aug 2010 17:23:24 +0200
Subject: [PATCH] --- yaml --- r: 207157 b: refs/heads/master c:
 028c1f6817c1ef49c61641dc1ae6c629e5bb32df h: refs/heads/master i:   207155:
 df238876d70ee9194b1a30cf0be7d1d57371ea02 v: v3

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

diff --git a/[refs] b/[refs]
index 6416a3b2b02a..5b3c286383c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a90993c693ab7bd72bcb28b105e8dd4f0698f836
+refs/heads/master: 028c1f6817c1ef49c61641dc1ae6c629e5bb32df
diff --git a/trunk/arch/cris/mm/fault.c b/trunk/arch/cris/mm/fault.c
index 72dbdbf0accf..a2b4c0b8f0fd 100644
--- a/trunk/arch/cris/mm/fault.c
+++ b/trunk/arch/cris/mm/fault.c
@@ -1,10 +1,7 @@
 /*
- *  linux/arch/cris/mm/fault.c
- *
- *  Copyright (C) 2000-2006  Axis Communications AB
- *
- *  Authors:  Bjorn Wesen
+ *  arch/cris/mm/fault.c
  *
+ *  Copyright (C) 2000-2010  Axis Communications AB
  */
 
 #include <linux/mm.h>
@@ -108,11 +105,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 	info.si_code = SEGV_MAPERR;
 
 	/*
-	 * If we're in an interrupt or have no user
-	 * context, we must not take the fault..
+	 * If we're in an interrupt or "atomic" operation 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);