Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ea7334b authored Oct 03, 2009 by Christoph Lameter Committed by Tejun Heo Oct 03, 2009

this_cpu: Use this_cpu ops for network statistics



Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Tejun Heo <tj@kernel.org>

parent fce22848

include/net/neighbour.h

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -90,12 +90,7 @@ struct neigh_statistics
	unsigned long unres_discards; /* number of unresolved drops */		unsigned long unres_discards; /* number of unresolved drops */
	};		};

	#define NEIGH_CACHE_STAT_INC(tbl, field) \		#define NEIGH_CACHE_STAT_INC(tbl, field) this_cpu_inc((tbl)->stats->field)
	do { \
	preempt_disable(); \
	(per_cpu_ptr((tbl)->stats, smp_processor_id())->field)++; \
	preempt_enable(); \
	} while (0)

	struct neighbour		struct neighbour
	{		{

include/net/netfilter/nf_conntrack.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -295,11 +295,11 @@ extern unsigned int nf_conntrack_htable_size;
	extern unsigned int nf_conntrack_max;		extern unsigned int nf_conntrack_max;

	#define NF_CT_STAT_INC(net, count) \		#define NF_CT_STAT_INC(net, count) \
	(per_cpu_ptr((net)->ct.stat, raw_smp_processor_id())->count++)		__this_cpu_inc((net)->ct.stat->count)
	#define NF_CT_STAT_INC_ATOMIC(net, count) \		#define NF_CT_STAT_INC_ATOMIC(net, count) \
	do { \		do { \
	local_bh_disable(); \		local_bh_disable(); \
	per_cpu_ptr((net)->ct.stat, raw_smp_processor_id())->count++; \		__this_cpu_inc((net)->ct.stat->count); \
	local_bh_enable(); \		local_bh_enable(); \
	} while (0)		} while (0)