git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
s390
/
lib
/
uaccess.S
diff --git
a/arch/s390/lib/uaccess.S
b/arch/s390/lib/uaccess.S
index
e8029ef
..
5d59e26
100644
(file)
--- a/
arch/s390/lib/uaccess.S
+++ b/
arch/s390/lib/uaccess.S
@@
-11,7
+11,7
@@
#include <linux/errno.h>
#include <asm/lowcore.h>
#include <linux/errno.h>
#include <asm/lowcore.h>
-#include <asm/offsets.h>
+#include <asm/
asm-
offsets.h>
.text
.align 4
.text
.align 4
@@
-198,12
+198,12
@@
__strnlen_user_asm:
0: srst %r2,%r1
jo 0b
sacf 0
0: srst %r2,%r1
jo 0b
sacf 0
- jh 1f # \0 found in string ?
ahi %r2,1 # strnlen_user result includes the \0
ahi %r2,1 # strnlen_user result includes the \0
-1: slr %r2,%r3
+ # or return count+1 if \0 not found
+ slr %r2,%r3
br %r14
2: sacf 0
br %r14
2: sacf 0
- lhi %r2,-EFAULT
+ slr %r2,%r2 # return 0 on exception
br %r14
.section __ex_table,"a"
.long 0b,2b
br %r14
.section __ex_table,"a"
.long 0b,2b