From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 28 Sep 2006 02:43:02 +0000 (-0700)
Subject: [SPARC]: Don't zero out tail during copy_from_user_inatomic().
X-Git-Tag: v2.6.19-rc1~649
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3a1d5c84ed2fa4034f86e3b204129c139471516e;p=linux-2.6-omap-h63xx.git

[SPARC]: Don't zero out tail during copy_from_user_inatomic().

Actually, since we use the same code for all the copying
types in and out of userspace, we check at runtime whether
preemption is disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/lib/copy_user.S b/arch/sparc/lib/copy_user.S
index 577505b692a..ef095b6c43b 100644
--- a/arch/sparc/lib/copy_user.S
+++ b/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