From 73a7c38e30706cdfe9a85844e135d11f6137bd08 Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu, 22 Sep 2005 21:44:20 -0700
Subject: [PATCH] --- yaml --- r: 9248 b: refs/heads/master c:
 fea03cb40a15e3c6647c0927300202e062e6792a h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/um/kernel/trap_kern.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4008ea6bce8b..5561ce1e6101 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12ebcd73e40e09f0dfddf89e465cc0541e0ff8b1
+refs/heads/master: fea03cb40a15e3c6647c0927300202e062e6792a
diff --git a/trunk/arch/um/kernel/trap_kern.c b/trunk/arch/um/kernel/trap_kern.c
index 90690b9b1f30..d297429ac360 100644
--- a/trunk/arch/um/kernel/trap_kern.c
+++ b/trunk/arch/um/kernel/trap_kern.c
@@ -40,6 +40,12 @@ int handle_page_fault(unsigned long address, unsigned long ip,
 	int err = -EFAULT;
 
 	*code_out = SEGV_MAPERR;
+
+	/* If the fault was during atomic operation, don't take the fault, just
+	 * fail. */
+	if (in_atomic())
+		goto out_nosemaphore;
+
 	down_read(&mm->mmap_sem);
 	vma = find_vma(mm, address);
 	if(!vma) 
@@ -90,6 +96,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
 	flush_tlb_page(vma, address);
 out:
 	up_read(&mm->mmap_sem);
+out_nosemaphore:
 	return(err);
 
 /*