1 files changed, 17 insertions, 44 deletions
diff --git a/arch/sparc/lib/copy_in_user.S b/arch/sparc/lib/copy_in_user.S
index 650af3f21f78..302c0e60dc2c 100644
--- a/arch/sparc/lib/copy_in_user.S
+++ b/arch/sparc/lib/copy_in_user.S
@@ -3,19 +3,16 @@
 * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
 */
+#include <linux/linkage.h>
 #include <asm/asi.h>
 #define XCC xcc
 #define EX(x,y)                 \
 98:     x,y;                    \
-        .section .fixup;        \
-        .align 4;               \
-99:     retl;                   \
-         mov 1, %o0;            \
        .section __ex_table,"a";\
        .align 4;               \
-        .word 98b, 99b;         \
+        .word 98b, __retl_one;  \
        .text;                  \
        .align 4;
@@ -31,18 +28,7 @@
         * to copy register windows around during thread cloning.
         */
-        .globl          ___copy_in_user
+ENTRY(___copy_in_user)  /* %o0=dst, %o1=src, %o2=len */
-        .type           ___copy_in_user,#function
-___copy_in_user:        /* %o0=dst, %o1=src, %o2=len */
-        /* Writing to %asi is _expensive_ so we hardcode it.
-         * Reading %asi to check for KERNEL_DS is comparatively
-         * cheap.
-         */
-        rd              %asi, %g1
-        cmp             %g1, ASI_AIUS
-        bne,pn          %icc, memcpy_user_stub
-         nop
        cmp             %o2, 0
        be,pn           %XCC, 85f
         or             %o0, %o1, %o3
@@ -53,22 +39,24 @@ ___copy_in_user:	/* %o0=dst, %o1=src, %o2=len */
        /* 16 < len <= 64 */
        andcc           %o3, 0x7, %g0
        bne,pn          %XCC, 90f
-         sub            %o0, %o1, %o3
+         nop
        andn            %o2, 0x7, %o4
        and             %o2, 0x7, %o2
 1:      subcc           %o4, 0x8, %o4
        EX(ldxa [%o1] %asi, %o5)
-        EX(stxa %o5, [%o1 + %o3] ASI_AIUS)
+        EX(stxa %o5, [%o0] %asi)
+        add             %o1, 0x8, %o1
        bgu,pt          %XCC, 1b
-         add            %o1, 0x8, %o1
+         add            %o0, 0x8, %o0
        andcc           %o2, 0x4, %g0
        be,pt           %XCC, 1f
         nop
        sub             %o2, 0x4, %o2
        EX(lduwa [%o1] %asi, %o5)
-        EX(stwa %o5, [%o1 + %o3] ASI_AIUS)
+        EX(stwa %o5, [%o0] %asi)
        add             %o1, 0x4, %o1
+        add             %o0, 0x4, %o0
 1:      cmp             %o2, 0
        be,pt           %XCC, 85f
         nop
@@ -78,14 +66,15 @@ ___copy_in_user:	/* %o0=dst, %o1=src, %o2=len */
 80:     /* 0 < len <= 16 */
        andcc           %o3, 0x3, %g0
        bne,pn          %XCC, 90f
-         sub            %o0, %o1, %o3
+         nop
 82:
        subcc           %o2, 4, %o2
        EX(lduwa [%o1] %asi, %g1)
-        EX(stwa %g1, [%o1 + %o3] ASI_AIUS)
+        EX(stwa %g1, [%o0] %asi)
+        add             %o1, 4, %o1
        bgu,pt          %XCC, 82b
-         add            %o1, 4, %o1
+         add            %o0, 4, %o0
 85:     retl
         clr            %o0
@@ -94,26 +83,10 @@ ___copy_in_user:	/* %o0=dst, %o1=src, %o2=len */
 90:
        subcc           %o2, 1, %o2
        EX(lduba [%o1] %asi, %g1)
-        EX(stba %g1, [%o1 + %o3] ASI_AIUS)
+        EX(stba %g1, [%o0] %asi)
+        add             %o1, 1, %o1
        bgu,pt          %XCC, 90b
-         add            %o1, 1, %o1
+         add            %o0, 1, %o0
        retl
         clr            %o0
+ENDPROC(___copy_in_user)
-        .size           ___copy_in_user, .-___copy_in_user
-        /* Act like copy_{to,in}_user(), ie. return zero instead
-         * of original destination pointer.  This is invoked when
-         * copy_{to,in}_user() finds that %asi is kernel space.
-         */
-        .globl          memcpy_user_stub
-        .type           memcpy_user_stub,#function
-memcpy_user_stub:
-        save            %sp, -192, %sp
-        mov             %i0, %o0
-        mov             %i1, %o1
-        call            memcpy
-         mov            %i2, %o2
-        ret
-         restore        %g0, %g0, %o0
-        .size           memcpy_user_stub, .-memcpy_user_stub

diff --git a/arch/sparc/lib/copy_in_user.S b/arch/sparc/lib/copy_in_user.S index 650af3f21f78..302c0e60dc2c 100644 --- a/arch/sparc/lib/copy_in_user.S +++ b/arch/sparc/lib/copy_in_user.S
@@ -3,19 +3,16 @@
3	* Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)	3	* Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
4	*/	4	*/
5		5
		6	#include <linux/linkage.h>
6	#include <asm/asi.h>	7	#include <asm/asi.h>
7		8
8	#define XCC xcc	9	#define XCC xcc
9		10
10	#define EX(x,y) \	11	#define EX(x,y) \
11	98: x,y; \	12	98: x,y; \
12	.section .fixup; \
13	.align 4; \
14	99: retl; \
15	mov 1, %o0; \
16	.section __ex_table,"a";\	13	.section __ex_table,"a";\
17	.align 4; \	14	.align 4; \
18	.word 98b, 99b; \	15	.word 98b, __retl_one; \
19	.text; \	16	.text; \
20	.align 4;	17	.align 4;
21		18
@@ -31,18 +28,7 @@
31	* to copy register windows around during thread cloning.	28	* to copy register windows around during thread cloning.
32	*/	29	*/
33		30
34	.globl ___copy_in_user	31	ENTRY(___copy_in_user) /* %o0=dst, %o1=src, %o2=len */
35	.type ___copy_in_user,#function
36	___copy_in_user: /* %o0=dst, %o1=src, %o2=len */
37	/* Writing to %asi is _expensive_ so we hardcode it.
38	* Reading %asi to check for KERNEL_DS is comparatively
39	* cheap.
40	*/
41	rd %asi, %g1
42	cmp %g1, ASI_AIUS
43	bne,pn %icc, memcpy_user_stub
44	nop
45
46	cmp %o2, 0	32	cmp %o2, 0
47	be,pn %XCC, 85f	33	be,pn %XCC, 85f
48	or %o0, %o1, %o3	34	or %o0, %o1, %o3
@@ -53,22 +39,24 @@ ___copy_in_user: /* %o0=dst, %o1=src, %o2=len */
53	/* 16 < len <= 64 */	39	/* 16 < len <= 64 */
54	andcc %o3, 0x7, %g0	40	andcc %o3, 0x7, %g0
55	bne,pn %XCC, 90f	41	bne,pn %XCC, 90f
56	sub %o0, %o1, %o3	42	nop
57		43
58	andn %o2, 0x7, %o4	44	andn %o2, 0x7, %o4
59	and %o2, 0x7, %o2	45	and %o2, 0x7, %o2
60	1: subcc %o4, 0x8, %o4	46	1: subcc %o4, 0x8, %o4
61	EX(ldxa [%o1] %asi, %o5)	47	EX(ldxa [%o1] %asi, %o5)
62	EX(stxa %o5, [%o1 + %o3] ASI_AIUS)	48	EX(stxa %o5, [%o0] %asi)
		49	add %o1, 0x8, %o1
63	bgu,pt %XCC, 1b	50	bgu,pt %XCC, 1b
64	add %o1, 0x8, %o1	51	add %o0, 0x8, %o0
65	andcc %o2, 0x4, %g0	52	andcc %o2, 0x4, %g0
66	be,pt %XCC, 1f	53	be,pt %XCC, 1f
67	nop	54	nop
68	sub %o2, 0x4, %o2	55	sub %o2, 0x4, %o2
69	EX(lduwa [%o1] %asi, %o5)	56	EX(lduwa [%o1] %asi, %o5)
70	EX(stwa %o5, [%o1 + %o3] ASI_AIUS)	57	EX(stwa %o5, [%o0] %asi)
71	add %o1, 0x4, %o1	58	add %o1, 0x4, %o1
		59	add %o0, 0x4, %o0
72	1: cmp %o2, 0	60	1: cmp %o2, 0
73	be,pt %XCC, 85f	61	be,pt %XCC, 85f
74	nop	62	nop
@@ -78,14 +66,15 @@ ___copy_in_user: /* %o0=dst, %o1=src, %o2=len */
78	80: /* 0 < len <= 16 */	66	80: /* 0 < len <= 16 */
79	andcc %o3, 0x3, %g0	67	andcc %o3, 0x3, %g0
80	bne,pn %XCC, 90f	68	bne,pn %XCC, 90f
81	sub %o0, %o1, %o3	69	nop
82		70
83	82:	71	82:
84	subcc %o2, 4, %o2	72	subcc %o2, 4, %o2
85	EX(lduwa [%o1] %asi, %g1)	73	EX(lduwa [%o1] %asi, %g1)
86	EX(stwa %g1, [%o1 + %o3] ASI_AIUS)	74	EX(stwa %g1, [%o0] %asi)
		75	add %o1, 4, %o1
87	bgu,pt %XCC, 82b	76	bgu,pt %XCC, 82b
88	add %o1, 4, %o1	77	add %o0, 4, %o0
89		78
90	85: retl	79	85: retl
91	clr %o0	80	clr %o0
@@ -94,26 +83,10 @@ ___copy_in_user: /* %o0=dst, %o1=src, %o2=len */
94	90:	83	90:
95	subcc %o2, 1, %o2	84	subcc %o2, 1, %o2
96	EX(lduba [%o1] %asi, %g1)	85	EX(lduba [%o1] %asi, %g1)
97	EX(stba %g1, [%o1 + %o3] ASI_AIUS)	86	EX(stba %g1, [%o0] %asi)
		87	add %o1, 1, %o1
98	bgu,pt %XCC, 90b	88	bgu,pt %XCC, 90b
99	add %o1, 1, %o1	89	add %o0, 1, %o0
100	retl	90	retl
101	clr %o0	91	clr %o0
102		92	ENDPROC(___copy_in_user)
103	.size ___copy_in_user, .-___copy_in_user
104
105	/* Act like copy_{to,in}_user(), ie. return zero instead
106	* of original destination pointer. This is invoked when
107	* copy_{to,in}_user() finds that %asi is kernel space.
108	*/
109	.globl memcpy_user_stub
110	.type memcpy_user_stub,#function
111	memcpy_user_stub:
112	save %sp, -192, %sp
113	mov %i0, %o0
114	mov %i1, %o1
115	call memcpy
116	mov %i2, %o2
117	ret
118	restore %g0, %g0, %o0
119	.size memcpy_user_stub, .-memcpy_user_stub