From 48811a77f883180f8553a38cc251da627ee26ea2 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Tue, 7 Dec 2010 04:26:16 +0000
Subject: [PATCH] --- yaml --- r: 224824 b: refs/heads/master c:
 f6dafa95d1a48f73ab4a5b0f7dc0dcb72817e051 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/packet/af_packet.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c712df16e1f3..e604bd5dc6d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15c2d75f49189e1769c5e8f5f099d03d055c4910
+refs/heads/master: f6dafa95d1a48f73ab4a5b0f7dc0dcb72817e051
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
index 17eafe5b48c6..9292ec93eb52 100644
--- a/trunk/net/packet/af_packet.c
+++ b/trunk/net/packet/af_packet.c
@@ -223,7 +223,7 @@ struct packet_skb_cb {
 
 #define PACKET_SKB_CB(__skb)	((struct packet_skb_cb *)((__skb)->cb))
 
-static inline struct page *pgv_to_page(void *addr)
+static inline __pure struct page *pgv_to_page(void *addr)
 {
 	if (is_vmalloc_addr(addr))
 		return vmalloc_to_page(addr);
@@ -806,6 +806,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
 
 	__packet_set_status(po, h.raw, status);
 	smp_mb();
+#if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE == 1
 	{
 		u8 *start, *end;
 
@@ -813,6 +814,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
 		for (start = h.raw; start < end; start += PAGE_SIZE)
 			flush_dcache_page(pgv_to_page(start));
 	}
+#endif
 
 	sk->sk_data_ready(sk, 0);