X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Farch%2Fmn10300%2Flib%2Fusercopy.c;fp=kernel%2Farch%2Fmn10300%2Flib%2Fusercopy.c;h=ce8899e5e171370ebc88c08a91727ef9232febf9;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=7826e6c364e74f0075e43081e5db367062baef30;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

diff --git a/kernel/arch/mn10300/lib/usercopy.c b/kernel/arch/mn10300/lib/usercopy.c
index 7826e6c36..ce8899e5e 100644
--- a/kernel/arch/mn10300/lib/usercopy.c
+++ b/kernel/arch/mn10300/lib/usercopy.c
@@ -9,7 +9,7 @@
  * as published by the Free Software Foundation; either version
  * 2 of the Licence, or (at your option) any later version.
  */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 unsigned long
 __generic_copy_to_user(void *to, const void *from, unsigned long n)
@@ -24,6 +24,8 @@ __generic_copy_from_user(void *to, const void *from, unsigned long n)
 {
 	if (access_ok(VERIFY_READ, from, n))
 		__copy_user_zeroing(to, from, n);
+	else
+		memset(to, 0, n);
 	return n;
 }