diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 18:08:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 18:08:16 -0500 |
| commit | 097916ecafd3bbedbde3ba068522093bf72319b3 (patch) | |
| tree | 95b8f52826883ccb04086725f0b94186adc1566f /net/ipv4/route.c | |
| parent | 3da38566dfd4b2402b280cb52ffc7c56f1a95b9c (diff) | |
| parent | 29f8f63272bd286549d1c7f75ad22686191d35d8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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; | |||
| 241 | static unsigned int rt_hash_rnd; | 241 | static unsigned int rt_hash_rnd; |
| 242 | 242 | ||
| 243 | static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat); | 243 | static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat); |
| 244 | #define RT_CACHE_STAT_INC(field) (__get_cpu_var(rt_cache_stat).field++) | 244 | #define RT_CACHE_STAT_INC(field) \ |
| 245 | (per_cpu(rt_cache_stat, raw_smp_processor_id()).field++) | ||
| 245 | 246 | ||
| 246 | static int rt_intern_hash(unsigned hash, struct rtable *rth, | 247 | static int rt_intern_hash(unsigned hash, struct rtable *rth, |
| 247 | struct rtable **res); | 248 | struct rtable **res); |