This commit was generated by cvs2svn to compensate for changes in r1129,

[linux-2.6.git] / arch / s390 / lib / uaccess.S

diff --git a/arch/s390/lib/uaccess.S b/arch/s390/lib/uaccess.S
index 3f5511d..0028a54 100644 (file)
--- a/arch/s390/lib/uaccess.S
+++ b/arch/s390/lib/uaccess.S
@@ -41,15 +41,15 @@ __copy_from_user_asm:
 5:     mvcp    0(%r5,%r2),0(%r4),%r0
        slr     %r3,%r5
        alr     %r2,%r5
-6:     lgr     %r5,%r3         # copy remaining size
+6:     lr      %r5,%r3         # copy remaining size
        ahi     %r5,-1          # subtract 1 for xc loop
        bras    %r4,8f
-       xc      0(1,%2),0(%2)
-7:     xc      0(256,%2),0(%2)
+       xc      0(1,%r2),0(%r2)
+7:     xc      0(256,%r2),0(%r2)
        la      %r2,256(%r2)
-8:     ahji    %r5,-256
+8:     ahi     %r5,-256
        jnm     7b
-       ex      %r5,0(%r2)
+       ex      %r5,0(%r4)
 9:     lr      %r2,%r3
        br      %r14
         .section __ex_table,"a"
@@ -98,31 +98,30 @@ __copy_to_user_asm:
         .globl __copy_in_user_asm
        # %r2 = from, %r3 = n, %r4 = to
 __copy_in_user_asm:
-       ahi     %r3,-1
-       jo      6f
        sacf    256
-       bras    %r1,4f
-0:     ahi     %r3,257
-1:     mvc     0(1,%r4),0(%r2)
+       bras    1,1f
+       mvc     0(1,%r4),0(%r2)
+0:     mvc     0(256,%r4),0(%r2)
+       la      %r2,256(%r2)
+       la      %r4,256(%r4)
+1:     ahi     %r3,-256
+       jnm     0b
+2:     ex      %r3,0(%r1)
+       sacf    0
+       slr     %r2,%r2
+       br      14
+3:     mvc     0(1,%r4),0(%r2)
        la      %r2,1(%r2)
        la      %r4,1(%r4)
        ahi     %r3,-1
-       jnz     1b
-2:     lr      %r2,%r3
-       br      %r14
-3:     mvc     0(256,%r4),0(%r2)
-       la      %r2,256(%r2)
-       la      %r4,256(%r4)
-4:     ahi     %r3,-256
        jnm     3b
-5:     ex      %r3,4(%r1)
+4:     lr      %r2,%r3
        sacf    0
-6:     slr     %r2,%r2
        br      %r14
         .section __ex_table,"a"
-       .long   1b,2b
-       .long   3b,0b
-       .long   5b,0b
+       .long   0b,3b
+       .long   2b,3b
+       .long   3b,4b
         .previous
 
         .align 4