patch-2.2.16 linux/include/asm-s390/uaccess.h

• Lines: 37
• Date: Wed Jun 7 14:26:44 2000
• Orig file: v2.2.15/linux/include/asm-s390/uaccess.h
• Orig date: Wed May 3 17:16:51 2000

diff -urN v2.2.15/linux/include/asm-s390/uaccess.h linux/include/asm-s390/uaccess.h
@@ -432,7 +432,7 @@
 static inline long
 strncpy_from_user(char *dst, const char *src, long count)
 {
-        int len;
+        long len;
         __asm__ __volatile__ (  "   iac   1\n"
 				"   slr   %0,%0\n"
 				"   lr    2,%1\n"
@@ -471,7 +471,8 @@
  *
  * Return 0 for error
  */
-static inline long strnlen_user(const char * src, long n)
+static inline unsigned long
+strnlen_user(const char * src, unsigned long n)
 {
 	__asm__ __volatile__ ("   iac   1\n"
                               "   alr   %0,%1\n"
@@ -500,7 +501,7 @@
 			      : "cc", "0", "1", "4" );
         return n;
 }
-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
+#define strlen_user(str) strnlen_user(str, ~0UL)
 
 /*
  * Zero Userspace
@@ -518,7 +519,7 @@
                                 "0: mvcle 4,2,0\n"
                                 "   jo    0b\n"
                                 "1: sacf  0(1)\n"
-                                "   lr    %0,3\n"
+                                "   lr    %0,5\n"
 				".section __ex_table,\"a\"\n"
 				"   .align 4\n"
 				"   .long  0b,1b\n"