summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 12:50:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 12:50:29 -0700
commit268bb0ce3e87872cb9290c322b0d35bce230d88f (patch)
treec8331ade4a3e24fc589c4eb62731bc2312d35333 /net
parent257313b2a87795e07a0bdf58d0fffbdba8b31051 (diff)
downloadlinux-3.10-268bb0ce3e87872cb9290c322b0d35bce230d88f.tar.gz
linux-3.10-268bb0ce3e87872cb9290c322b0d35bce230d88f.tar.bz2
linux-3.10-268bb0ce3e87872cb9290c322b0d35bce230d88f.zip
sanitize <linux/prefetch.h> usage
Commit e66eed651fd1 ("list: remove prefetching from regular list iterators") removed the include of prefetch.h from list.h, which uncovered several cases that had apparently relied on that rather obscure header file dependency. So this fixes things up a bit, using grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]') grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]') to guide us in finding files that either need <linux/prefetch.h> inclusion, or have it despite not needing it. There are more of them around (mostly network drivers), but this gets many core ones. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/core/dst.c1
-rw-r--r--net/core/pktgen.c1
-rw-r--r--net/core/skbuff.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/net/core/dst.c b/net/core/dst.c
index 91104d35de7..0a3920bf361 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -19,6 +19,7 @@
#include <linux/types.h>
#include <net/net_namespace.h>
#include <linux/sched.h>
+#include <linux/prefetch.h>
#include <net/dst.h>
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index aeeece72b72..6ed9e27d820 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -156,6 +156,7 @@
#include <linux/wait.h>
#include <linux/etherdevice.h>
#include <linux/kthread.h>
+#include <linux/prefetch.h>
#include <net/net_namespace.h>
#include <net/checksum.h>
#include <net/ipv6.h>
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 7ebeed0a877..960ea899c86 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -57,6 +57,7 @@
#include <linux/init.h>
#include <linux/scatterlist.h>
#include <linux/errqueue.h>
+#include <linux/prefetch.h>
#include <net/protocol.h>
#include <net/dst.h>