Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / arch / s390 / lib / uaccess64.S

diff --git a/arch/s390/lib/uaccess64.S b/arch/s390/lib/uaccess64.S
index 50219786fc7ac8bc86138594a4fd253c3a2048eb..1f755be22f92736a7c38f6110e2a9edf5c394339 100644 (file)
--- a/arch/s390/lib/uaccess64.S
+++ b/arch/s390/lib/uaccess64.S
@@ -88,30 +88,31 @@ __copy_to_user_asm:
         .globl __copy_in_user_asm
        # %r2 = from, %r3 = n, %r4 = to
 __copy_in_user_asm:
+       aghi    %r3,-1
+       jo      6f
        sacf    256
-       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:     aghi    %r3,-256
-       jnm     0b
-2:     ex      %r3,0(%r1)
-       sacf    0
-       slgr    %r2,%r2
-       br      14
-3:     mvc     0(1,%r4),0(%r2)
+       bras    %r1,4f
+0:     aghi    %r3,257
+1:     mvc     0(1,%r4),0(%r2)
        la      %r2,1(%r2)
        la      %r4,1(%r4)
        aghi    %r3,-1
+       jnz     1b
+2:     lgr     %r2,%r3
+       br      %r14
+3:     mvc     0(256,%r4),0(%r2)
+       la      %r2,256(%r2)
+       la      %r4,256(%r4)
+4:     aghi    %r3,-256
        jnm     3b
-4:     lgr     %r2,%r3
+5:     ex      %r3,4(%r1)
        sacf    0
-       br      %r14
+6:     slgr    %r2,%r2
+       br      14
         .section __ex_table,"a"
-       .quad   0b,3b
-       .quad   2b,3b
-       .quad   3b,4b
+       .quad   1b,2b
+       .quad   3b,0b
+       .quad   5b,0b
         .previous
 
         .align 4
@@ -194,12 +195,12 @@ __strnlen_user_asm:
 0:     srst    %r2,%r1
        jo      0b
        sacf    0
-       jh      1f              # \0 found in string ?
        aghi    %r2,1           # strnlen_user result includes the \0
-1:     slgr    %r2,%r3
+                               # or return count+1 if \0 not found
+       slgr    %r2,%r3
        br      %r14
 2:     sacf    0
-       lghi    %r2,-EFAULT
+       slgr    %r2,%r2         # return 0 on exception
        br      %r14
        .section __ex_table,"a"
        .quad   0b,2b