Merge tag 'powerpc-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / include / linux / uaccess.h

diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index 5a328cf..47e5d37 100644 (file)
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -148,7 +148,7 @@ _copy_to_user(void __user *, const void *, unsigned long);
 static __always_inline unsigned long __must_check
 copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-       if (likely(check_copy_size(to, n, false)))
+       if (check_copy_size(to, n, false))
                n = _copy_from_user(to, from, n);
        return n;
 }
@@ -156,7 +156,7 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
 static __always_inline unsigned long __must_check
 copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-       if (likely(check_copy_size(from, n, true)))
+       if (check_copy_size(from, n, true))
                n = _copy_to_user(to, from, n);
        return n;
 }