Merge tag 'fixes-for-linus-v4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull uaccess fixes from Guenter Roeck:
 "Two patches fixing problems introduced with copy_from_user changes"

* tag 'fixes-for-linus-v4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  openrisc: fix the fix of copy_from_user()
  avr32: fix 'undefined reference to `___copy_from_user'

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/avr32/lib/copy_user.S b/arch/avr32/lib/copy_user.S
index 96a6de9d578f..075373471da1 100644
--- a/arch/avr32/lib/copy_user.S
+++ b/arch/avr32/lib/copy_user.S
@@ -23,8 +23,8 @@
          */
         .text
         .align  1
-        .global copy_from_user
-        .type   copy_from_user, @function
+        .global ___copy_from_user
+        .type   ___copy_from_user, @function
 ___copy_from_user:
         branch_if_kernel r8, __copy_user
         ret_if_privileged r8, r11, r10, r10
diff --git a/arch/openrisc/include/asm/uaccess.h b/arch/openrisc/include/asm/uaccess.h
index cbad29b5a131..5cc6b4f1b795 100644
--- a/arch/openrisc/include/asm/uaccess.h
+++ b/arch/openrisc/include/asm/uaccess.h
@@ -276,7 +276,7 @@ copy_from_user(void *to, const void *from, unsigned long n)
         unsigned long res = n;
 
         if (likely(access_ok(VERIFY_READ, from, n)))
-                n = __copy_tofrom_user(to, from, n);
+                res = __copy_tofrom_user(to, from, n);
         if (unlikely(res))
                 memset(to + (n - res), 0, res);
         return res;