summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v10/lib/usercopy.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-24 20:46:01 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-24 20:46:01 +0100
commit7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba (patch)
tree0a6e858d2c9e6e8cd7da1d4268972071fbeb77ca /arch/cris/arch-v10/lib/usercopy.c
parentMerge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 (diff)
downloadlinux-7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba.tar.xz
linux-7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba.zip
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
This was entirely automated, using the script by Al: PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>' sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \ $(git grep -l "$PATT"|grep -v ^include/linux/uaccess.h) to do the replacement at the end of the merge window. Requested-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/arch-v10/lib/usercopy.c')
-rw-r--r--arch/cris/arch-v10/lib/usercopy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/lib/usercopy.c b/arch/cris/arch-v10/lib/usercopy.c
index b964c667aced..1ba7cc000dfc 100644
--- a/arch/cris/arch-v10/lib/usercopy.c
+++ b/arch/cris/arch-v10/lib/usercopy.c
@@ -8,7 +8,7 @@
* Pieces used from memcpy, originally by Kenny Ranerup long time ago.
*/
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* Asm:s have been tweaked (within the domain of correctness) to give
satisfactory results for "gcc version 2.96 20000427 (experimental)".