From 8cc5f9dff2ea14af56ff4302d9eaa8e27170c6de Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Wed, 27 Sep 2006 19:43:02 -0700
Subject: [PATCH] --- yaml --- r: 37208 b: refs/heads/master c:
 3a1d5c84ed2fa4034f86e3b204129c139471516e h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc/lib/copy_user.S | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7e0f0c00ad7b..bdd7e1566425 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6c641026dec68acfb4b0baa98aad960e963ed97
+refs/heads/master: 3a1d5c84ed2fa4034f86e3b204129c139471516e
diff --git a/trunk/arch/sparc/lib/copy_user.S b/trunk/arch/sparc/lib/copy_user.S
index 577505b692ae..ef095b6c43b1 100644
--- a/trunk/arch/sparc/lib/copy_user.S
+++ b/trunk/arch/sparc/lib/copy_user.S
@@ -14,6 +14,7 @@
 #include <asm/ptrace.h>
 #include <asm/asmmacro.h>
 #include <asm/page.h>
+#include <asm/thread_info.h>
 
 /* Work around cpp -rob */
 #define ALLOC #alloc
@@ -366,6 +367,9 @@ fixupretl:
 	blu	1f
 	 cmp	%o1, %g1
 	bgeu	1f
+	 ld	[%g6 + TI_PREEMPT], %g1
+	cmp	%g1, 0
+	bne	1f
 	 nop
 	save	%sp, -64, %sp
 	mov	%i0, %o0