3 files changed, 21 insertions, 40 deletions

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 0302f31a2fb7..b0173202cad9 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -88,12 +88,7 @@ struct neigh_statistics {
         unsigned long unres_discards;   /* number of unresolved drops */
 };
 
-#define NEIGH_CACHE_STAT_INC(tbl, field)                                \
-        do {                                                            \
-                preempt_disable();                                      \
-                (per_cpu_ptr((tbl)->stats, smp_processor_id())->field)++; \
-                preempt_enable();                                       \
-        } while (0)
+#define NEIGH_CACHE_STAT_INC(tbl, field) this_cpu_inc((tbl)->stats->field)
 
 struct neighbour {
         struct neighbour        *next;
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 5cf7270e3ffc..a0904adfb8f7 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -293,11 +293,11 @@ extern unsigned int nf_conntrack_htable_size;
 extern unsigned int nf_conntrack_max;
 
 #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)               \
 do {                                                    \
         local_bh_disable();                             \
-        per_cpu_ptr((net)->ct.stat, raw_smp_processor_id())->count++;   \
+        __this_cpu_inc((net)->ct.stat->count);          \
         local_bh_enable();                              \
 } while (0)
 
diff --git a/include/net/snmp.h b/include/net/snmp.h
index 8c842e06bec8..f0d756f2ac99 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -136,45 +136,31 @@ struct linux_xfrm_mib {
 #define SNMP_STAT_BHPTR(name)   (name[0])
 #define SNMP_STAT_USRPTR(name)  (name[1])
 
-#define SNMP_INC_STATS_BH(mib, field)   \
-        (per_cpu_ptr(mib[0], raw_smp_processor_id())->mibs[field]++)
-#define SNMP_INC_STATS_USER(mib, field) \
-        do { \
-                per_cpu_ptr(mib[1], get_cpu())->mibs[field]++; \
-                put_cpu(); \
-        } while (0)
-#define SNMP_INC_STATS(mib, field)      \
-        do { \
-                per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field]++; \
-                put_cpu(); \
-        } while (0)
-#define SNMP_DEC_STATS(mib, field)      \
-        do { \
-                per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field]--; \
-                put_cpu(); \
-        } while (0)
-#define SNMP_ADD_STATS(mib, field, addend)      \
-        do { \
-                per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field] += addend; \
-                put_cpu(); \
-        } while (0)
-#define SNMP_ADD_STATS_BH(mib, field, addend)   \
-        (per_cpu_ptr(mib[0], raw_smp_processor_id())->mibs[field] += addend)
-#define SNMP_ADD_STATS_USER(mib, field, addend)         \
-        do { \
-                per_cpu_ptr(mib[1], get_cpu())->mibs[field] += addend; \
-                put_cpu(); \
-        } while (0)
+#define SNMP_INC_STATS_BH(mib, field)   \
+                        __this_cpu_inc(mib[0]->mibs[field])
+#define SNMP_INC_STATS_USER(mib, field) \
+                        this_cpu_inc(mib[1]->mibs[field])
+#define SNMP_INC_STATS(mib, field)      \
+                        this_cpu_inc(mib[!in_softirq()]->mibs[field])
+#define SNMP_DEC_STATS(mib, field)      \
+                        this_cpu_dec(mib[!in_softirq()]->mibs[field])
+#define SNMP_ADD_STATS_BH(mib, field, addend)   \
+                        __this_cpu_add(mib[0]->mibs[field], addend)
+#define SNMP_ADD_STATS_USER(mib, field, addend) \
+                        this_cpu_add(mib[1]->mibs[field], addend)
 #define SNMP_UPD_PO_STATS(mib, basefield, addend)       \
         do { \
-                __typeof__(mib[0]) ptr = per_cpu_ptr(mib[!in_softirq()], get_cpu());\
+                __typeof__(mib[0]) ptr; \
+                preempt_disable(); \
+                ptr = this_cpu_ptr((mib)[!in_softirq()]); \
                 ptr->mibs[basefield##PKTS]++; \
                 ptr->mibs[basefield##OCTETS] += addend;\
-                put_cpu(); \
+                preempt_enable(); \
         } while (0)
 #define SNMP_UPD_PO_STATS_BH(mib, basefield, addend)    \
         do { \
-                __typeof__(mib[0]) ptr = per_cpu_ptr(mib[!in_softirq()], raw_smp_processor_id());\
+                __typeof__(mib[0]) ptr = \
+                        __this_cpu_ptr((mib)[!in_softirq()]); \
                 ptr->mibs[basefield##PKTS]++; \
                 ptr->mibs[basefield##OCTETS] += addend;\
         } while (0)