diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-09 04:32:05 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-09 04:32:05 +0100 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /arch/s390/lib/uaccess64.S | |
| parent | Merge ../powerpc-merge (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
| download | linux-516450179454de9e689e0a53ed8f34b896e8651c.tar.xz linux-516450179454de9e689e0a53ed8f34b896e8651c.zip | |
Merge ../linux-2.6
Diffstat (limited to 'arch/s390/lib/uaccess64.S')
| -rw-r--r-- | arch/s390/lib/uaccess64.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/lib/uaccess64.S b/arch/s390/lib/uaccess64.S index 50219786fc7a..19b41a33c230 100644 --- a/arch/s390/lib/uaccess64.S +++ b/arch/s390/lib/uaccess64.S @@ -194,12 +194,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 |