2 files changed, 7 insertions, 8 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 827681540d6f..16c9c091555d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -28,7 +28,6 @@
 #include <net/checksum.h>
 #include <linux/rcupdate.h>
 #include <linux/dmaengine.h>
-#include <linux/prefetch.h>
 #include <linux/hrtimer.h>
 
 /* Don't change this without changing skb_csum_unnecessary! */
@@ -1783,7 +1782,7 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
 
 #define skb_queue_walk(queue, skb) \
                 for (skb = (queue)->next;                                       \
-                     prefetch(skb->next), (skb != (struct sk_buff *)(queue));   \
+                     skb != (struct sk_buff *)(queue);                          \
                      skb = skb->next)
 
 #define skb_queue_walk_safe(queue, skb, tmp)                                    \
@@ -1792,7 +1791,7 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
                      skb = tmp, tmp = skb->next)
 
 #define skb_queue_walk_from(queue, skb)                                         \
-                for (; prefetch(skb->next), (skb != (struct sk_buff *)(queue)); \
+                for (; skb != (struct sk_buff *)(queue);                        \
                      skb = skb->next)
 
 #define skb_queue_walk_from_safe(queue, skb, tmp)                               \
@@ -1802,7 +1801,7 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
 
 #define skb_queue_reverse_walk(queue, skb) \
                 for (skb = (queue)->prev;                                       \
-                     prefetch(skb->prev), (skb != (struct sk_buff *)(queue));   \
+                     skb != (struct sk_buff *)(queue);                          \
                      skb = skb->prev)
 
 #define skb_queue_reverse_walk_safe(queue, skb, tmp)                            \
diff --git a/net/netlabel/netlabel_addrlist.h b/net/netlabel/netlabel_addrlist.h
index 1c1c093cf279..2b9644e19de0 100644
--- a/net/netlabel/netlabel_addrlist.h
+++ b/net/netlabel/netlabel_addrlist.h
@@ -96,12 +96,12 @@ static inline struct netlbl_af4list *__af4list_valid_rcu(struct list_head *s,
 
 #define netlbl_af4list_foreach(iter, head)                              \
         for (iter = __af4list_valid((head)->next, head);                \
-             prefetch(iter->list.next), &iter->list != (head);          \
+             &iter->list != (head);                                     \
              iter = __af4list_valid(iter->list.next, head))
 
 #define netlbl_af4list_foreach_rcu(iter, head)                          \
         for (iter = __af4list_valid_rcu((head)->next, head);            \
-             prefetch(iter->list.next), &iter->list != (head);          \
+             &iter->list != (head);                                     \
              iter = __af4list_valid_rcu(iter->list.next, head))
 
 #define netlbl_af4list_foreach_safe(iter, tmp, head)                    \
@@ -163,12 +163,12 @@ static inline struct netlbl_af6list *__af6list_valid_rcu(struct list_head *s,
 
 #define netlbl_af6list_foreach(iter, head)                              \
         for (iter = __af6list_valid((head)->next, head);                \
-             prefetch(iter->list.next), &iter->list != (head);          \
+             &iter->list != (head);                                     \
              iter = __af6list_valid(iter->list.next, head))
 
 #define netlbl_af6list_foreach_rcu(iter, head)                          \
         for (iter = __af6list_valid_rcu((head)->next, head);            \
-             prefetch(iter->list.next), &iter->list != (head);          \
+             &iter->list != (head);                                     \
              iter = __af6list_valid_rcu(iter->list.next, head))
 
 #define netlbl_af6list_foreach_safe(iter, tmp, head)                    \