aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-24 14:46:01 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-24 14:46:01 -0500
commit7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba (patch)
tree0a6e858d2c9e6e8cd7da1d4268972071fbeb77ca /include/net
parent1dd5c6b15372c7c127c509afa9a816bad5feed3b (diff)
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 'include/net')
-rw-r--r--include/net/checksum.h2
-rw-r--r--include/net/sctp/sctp.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/checksum.h b/include/net/checksum.h
index 5c30891e84e5..35d0fabd2782 100644
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
@@ -22,7 +22,7 @@
22#include <linux/errno.h> 22#include <linux/errno.h>
23#include <asm/types.h> 23#include <asm/types.h>
24#include <asm/byteorder.h> 24#include <asm/byteorder.h>
25#include <asm/uaccess.h> 25#include <linux/uaccess.h>
26#include <asm/checksum.h> 26#include <asm/checksum.h>
27 27
28#ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER 28#ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index f0dcaebebddb..d8833a86cd7e 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -69,7 +69,7 @@
69#include <net/ip6_route.h> 69#include <net/ip6_route.h>
70#endif 70#endif
71 71
72#include <asm/uaccess.h> 72#include <linux/uaccess.h>
73#include <asm/page.h> 73#include <asm/page.h>
74#include <net/sock.h> 74#include <net/sock.h>
75#include <net/snmp.h> 75#include <net/snmp.h>