diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-01-18 06:58:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 07:46:49 +0100 |
| commit | dbd2915ce87e811165da0717f8e159276ebb803e (patch) | |
| tree | 81214471e4f7510d4231020cacf2a52cf43d7715 /net/ipv4/route.c | |
| parent | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 (diff) | |
| download | linux-dbd2915ce87e811165da0717f8e159276ebb803e.tar.xz linux-dbd2915ce87e811165da0717f8e159276ebb803e.zip | |
[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/route.c')
| -rw-r--r-- | net/ipv4/route.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index f2e82afc15b3..d82c242ea704 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); |