[IPV4]: RT_CACHE_STAT_INC() warning fix
authorAndrew Morton <akpm@osdl.org>
Wed, 18 Jan 2006 05:58:01 +0000 (21:58 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 18 Jan 2006 06:46:49 +0000 (22:46 -0800)
BUG: using smp_processor_id() in preemptible [00000001] code: rpc.statd/2408

And it _is_ a bug, but I guess we don't care enough to add preempt_disable().

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/route.c

index f2e82afc15b301653e789d6a90f42fa53b034f26..d82c242ea7049b7c84aaf03f71ae0dbc38f86c0c 100644 (file)
@@ -241,7 +241,8 @@ static int                  rt_hash_log;
 static unsigned int            rt_hash_rnd;
 
 static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat);
-#define RT_CACHE_STAT_INC(field) (__get_cpu_var(rt_cache_stat).field++)
+#define RT_CACHE_STAT_INC(field) \
+       (per_cpu(rt_cache_stat, raw_smp_processor_id()).field++)
 
 static int rt_intern_hash(unsigned hash, struct rtable *rth,
                                struct rtable **res);