summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-01-17 21:58:01 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-17 22:46:49 -0800
commitdbd2915ce87e811165da0717f8e159276ebb803e (patch)
tree81214471e4f7510d4231020cacf2a52cf43d7715 /net/ipv4
parent7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff)
downloadop-kernel-dev-dbd2915ce87e811165da0717f8e159276ebb803e.zip
op-kernel-dev-dbd2915ce87e811165da0717f8e159276ebb803e.tar.gz
[IPV4]: RT_CACHE_STAT_INC() warning fix
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>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/route.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index f2e82af..d82c242 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -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);
OpenPOWER on IntegriCloud