Merge tag 's390-5.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[people/ms/linux.git] / arch / s390 / include / asm / uaccess.h

diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index 2a067315fe593710663d0a0851f2c72f156b024a..f7038b800cc366df30e7846a3e6d743efdec478c 100644 (file)
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -39,7 +39,7 @@ _copy_from_user_key(void *to, const void __user *from, unsigned long n, unsigned
 static __always_inline unsigned long __must_check
 copy_from_user_key(void *to, const void __user *from, unsigned long n, unsigned long key)
 {
-       if (likely(check_copy_size(to, n, false)))
+       if (check_copy_size(to, n, false))
                n = _copy_from_user_key(to, from, n, key);
        return n;
 }
@@ -50,7 +50,7 @@ _copy_to_user_key(void __user *to, const void *from, unsigned long n, unsigned l
 static __always_inline unsigned long __must_check
 copy_to_user_key(void __user *to, const void *from, unsigned long n, unsigned long key)
 {
-       if (likely(check_copy_size(from, n, true)))
+       if (check_copy_size(from, n, true))
                n = _copy_to_user_key(to, from, n, key);
        return n;
 }