Signed-off-by: Christoph Lameter --- include/net/neighbour.h | 6 +----- net/core/neighbour.c | 11 ++++++----- 2 files changed, 7 insertions(+), 10 deletions(-) Index: linux-2.6/include/net/neighbour.h =================================================================== --- linux-2.6.orig/include/net/neighbour.h 2007-11-18 14:38:23.910033621 -0800 +++ linux-2.6/include/net/neighbour.h 2007-11-18 22:04:47.465297422 -0800 @@ -81,11 +81,7 @@ struct neigh_statistics }; #define NEIGH_CACHE_STAT_INC(tbl, field) \ - do { \ - preempt_disable(); \ - (per_cpu_ptr((tbl)->stats, smp_processor_id())->field)++; \ - preempt_enable(); \ - } while (0) + _CPU_INC(tbl->stats->field) struct neighbour { Index: linux-2.6/net/core/neighbour.c =================================================================== --- linux-2.6.orig/net/core/neighbour.c 2007-11-18 14:38:23.918033788 -0800 +++ linux-2.6/net/core/neighbour.c 2007-11-18 21:55:23.064297499 -0800 @@ -1348,7 +1348,8 @@ void neigh_table_init_no_netlink(struct kmem_cache_create(tbl->id, tbl->entry_size, 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); - tbl->stats = alloc_percpu(struct neigh_statistics); + tbl->stats = CPU_ALLOC(struct neigh_statistics, + GFP_KERNEL | __GFP_ZERO); if (!tbl->stats) panic("cannot create neighbour cache statistics"); @@ -1437,7 +1438,7 @@ int neigh_table_clear(struct neigh_table remove_proc_entry(tbl->id, init_net.proc_net_stat); - free_percpu(tbl->stats); + CPU_FREE(tbl->stats); tbl->stats = NULL; kmem_cache_destroy(tbl->kmem_cachep); @@ -1694,7 +1695,7 @@ static int neightbl_fill_info(struct sk_ for_each_possible_cpu(cpu) { struct neigh_statistics *st; - st = per_cpu_ptr(tbl->stats, cpu); + st = CPU_PTR(tbl->stats, cpu); ndst.ndts_allocs += st->allocs; ndst.ndts_destroys += st->destroys; ndst.ndts_hash_grows += st->hash_grows; @@ -2343,7 +2344,7 @@ static void *neigh_stat_seq_start(struct if (!cpu_possible(cpu)) continue; *pos = cpu+1; - return per_cpu_ptr(tbl->stats, cpu); + return CPU_PTR(tbl->stats, cpu); } return NULL; } @@ -2358,7 +2359,7 @@ static void *neigh_stat_seq_next(struct if (!cpu_possible(cpu)) continue; *pos = cpu+1; - return per_cpu_ptr(tbl->stats, cpu); + return CPU_PTR(tbl->stats, cpu); } return NULL; } -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/