Merge tag 'docs-5.15' of git://git.lwn.net/linux

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

diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c
index 7ec8b1f..94ca99b 100644 (file)
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
@@ -338,55 +338,3 @@ unsigned long __clear_user(void __user *to, unsigned long size)
        return clear_user_xc(to, size);
 }
 EXPORT_SYMBOL(__clear_user);
-
-static inline unsigned long strnlen_user_srst(const char __user *src,
-                                             unsigned long size)
-{
-       unsigned long tmp1, tmp2;
-
-       asm volatile(
-               "   lghi  0,0\n"
-               "   la    %2,0(%1)\n"
-               "   la    %3,0(%0,%1)\n"
-               "   slgr  %0,%0\n"
-               "   sacf  256\n"
-               "0: srst  %3,%2\n"
-               "   jo    0b\n"
-               "   la    %0,1(%3)\n"   /* strnlen_user results includes \0 */
-               "   slgr  %0,%1\n"
-               "1: sacf  768\n"
-               EX_TABLE(0b,1b)
-               : "+a" (size), "+a" (src), "=a" (tmp1), "=a" (tmp2)
-               :
-               : "cc", "memory", "0");
-       return size;
-}
-
-unsigned long __strnlen_user(const char __user *src, unsigned long size)
-{
-       if (unlikely(!size))
-               return 0;
-       return strnlen_user_srst(src, size);
-}
-EXPORT_SYMBOL(__strnlen_user);
-
-long __strncpy_from_user(char *dst, const char __user *src, long size)
-{
-       size_t done, len, offset, len_str;
-
-       if (unlikely(size <= 0))
-               return 0;
-       done = 0;
-       do {
-               offset = (size_t)src & (L1_CACHE_BYTES - 1);
-               len = min(size - done, L1_CACHE_BYTES - offset);
-               if (copy_from_user(dst, src, len))
-                       return -EFAULT;
-               len_str = strnlen(dst, len);
-               done += len_str;
-               src += len_str;
-               dst += len_str;
-       } while ((len_str == len) && (done < size));
-       return done;
-}
-EXPORT_SYMBOL(__strncpy_from_user);