diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 2 | ||||
-rw-r--r-- | net/ipv4/route.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index cee3397ec277..706c0025ec5e 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
@@ -1761,7 +1761,7 @@ translate_compat_table(const char *name, | |||
1761 | goto free_newinfo; | 1761 | goto free_newinfo; |
1762 | 1762 | ||
1763 | /* And one copy for every other CPU */ | 1763 | /* And one copy for every other CPU */ |
1764 | for_each_cpu(i) | 1764 | for_each_possible_cpu(i) |
1765 | if (newinfo->entries[i] && newinfo->entries[i] != entry1) | 1765 | if (newinfo->entries[i] && newinfo->entries[i] != entry1) |
1766 | memcpy(newinfo->entries[i], entry1, newinfo->size); | 1766 | memcpy(newinfo->entries[i], entry1, newinfo->size); |
1767 | 1767 | ||
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index cc9423de7311..60b11aece5c3 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -244,7 +244,7 @@ static unsigned int rt_hash_rnd; | |||
244 | 244 | ||
245 | static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat); | 245 | static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat); |
246 | #define RT_CACHE_STAT_INC(field) \ | 246 | #define RT_CACHE_STAT_INC(field) \ |
247 | (per_cpu(rt_cache_stat, raw_smp_processor_id()).field++) | 247 | (__raw_get_cpu_var(rt_cache_stat).field++) |
248 | 248 | ||
249 | static int rt_intern_hash(unsigned hash, struct rtable *rth, | 249 | static int rt_intern_hash(unsigned hash, struct rtable *rth, |
250 | struct rtable **res); | 250 | struct rtable **res); |