aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/lib/U1copy_to_user.S
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-07 16:47:30 -0500
committerSteve French <sfrench@us.ibm.com>2006-03-07 16:47:30 -0500
commitf6e77c94796edad172602234826a022d463d910e (patch)
treef5cb0848c9e848499b0f0676fafe7ff207538ae8 /arch/sparc64/lib/U1copy_to_user.S
parentbeb84dc8186662b17d5ea510fabb85cb7e266d33 (diff)
parentd0b004840bd3b5ff2f2a0ad14fa0bd43349f5175 (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/sparc64/lib/U1copy_to_user.S')
-rw-r--r--arch/sparc64/lib/U1copy_to_user.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/lib/U1copy_to_user.S b/arch/sparc64/lib/U1copy_to_user.S
index 1fccc521e2bd..d1210ffb0b82 100644
--- a/arch/sparc64/lib/U1copy_to_user.S
+++ b/arch/sparc64/lib/U1copy_to_user.S
@@ -9,7 +9,7 @@
9 .align 4; \ 9 .align 4; \
1099: retl; \ 1099: retl; \
11 mov 1, %o0; \ 11 mov 1, %o0; \
12 .section __ex_table; \ 12 .section __ex_table,"a";\
13 .align 4; \ 13 .align 4; \
14 .word 98b, 99b; \ 14 .word 98b, 99b; \
15 .text; \ 15 .text; \