---

yaml --- r: 202575 b: refs/heads/master c: 27f39c7 h: refs/heads/master i: 202573: 84c932a 202571: 325f5ad 202567: bfa0aa9 202559: 717de54 v: v3
git-mirror · May 31, 2010 · a5fc299 · a5fc299
1 parent 8b7218c
commit a5fc299
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 604c1b1868f16e7b2fc13401d8c9147f167bec0a
+refs/heads/master: 27f39c73e63833b4c081a0d681d88b4184a0491d
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2822,8 +2822,7 @@ static int __netif_receive_skb(struct sk_buff *skb)
 			skb->dev = master;
 	}
 
-	__get_cpu_var(softnet_data).processed++;
-
+	__this_cpu_inc(softnet_data.processed);
 	skb_reset_network_header(skb);
 	skb_reset_transport_header(skb);
 	skb->mac_len = skb->network_header - skb->mac_header;

diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -253,8 +253,7 @@ static unsigned			rt_hash_mask __read_mostly;
 static unsigned int		rt_hash_log  __read_mostly;
 
 static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat);
-#define RT_CACHE_STAT_INC(field) \
-	(__raw_get_cpu_var(rt_cache_stat).field++)
+#define RT_CACHE_STAT_INC(field) __this_cpu_inc(rt_cache_stat.field)
 
 static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
 				   int genid)