datapath: Use per_cpu_ptr instead of percpu_ptr.

percpu_ptr was removed in 2.6.30, so update the one remaining user
and take out the compatibility code.

Suggested-by: Ben Pfaff <blp@nicira.com>

diff --git a/datapath/datapath.c b/datapath/datapath.c
index a083274b5abb8f3d80acf247da8d9da1e63473c3..1d007b04b083f5a6ee9ad1032d3733ef7ac5e66d 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1347,7 +1347,7 @@ static int get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp)
        stats.n_frags = stats.n_hit = stats.n_missed = stats.n_lost = 0;
        for_each_possible_cpu(i) {
                const struct dp_stats_percpu *s;
-               s = percpu_ptr(dp->stats_percpu, i);
+               s = per_cpu_ptr(dp->stats_percpu, i);
                stats.n_frags += s->n_frags;
                stats.n_hit += s->n_hit;
                stats.n_missed += s->n_missed;

diff --git a/datapath/linux-2.6/Modules.mk b/datapath/linux-2.6/Modules.mk
index 75e885c19e1f09143b9c66d5fa8842d69ed3cbd2..c63e3eaef0bc0da257aefc3dfed2d630598df137 100644 (file)
--- a/datapath/linux-2.6/Modules.mk
+++ b/datapath/linux-2.6/Modules.mk
@@ -30,7 +30,6 @@ openvswitch_headers += \
        linux-2.6/compat-2.6/include/linux/netfilter_bridge.h \
        linux-2.6/compat-2.6/include/linux/netfilter_ipv4.h \
        linux-2.6/compat-2.6/include/linux/netlink.h \
-       linux-2.6/compat-2.6/include/linux/percpu.h \
        linux-2.6/compat-2.6/include/linux/random.h \
        linux-2.6/compat-2.6/include/linux/rculist.h \
        linux-2.6/compat-2.6/include/linux/rtnetlink.h \

diff --git a/datapath/linux-2.6/compat-2.6/include/linux/percpu.h b/datapath/linux-2.6/compat-2.6/include/linux/percpu.h
deleted file mode 100644 (file)
index 0f68bb2..0000000
--- a/datapath/linux-2.6/compat-2.6/include/linux/percpu.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __LINUX_PERCPU_H_WRAPPER
-#define __LINUX_PERCPU_H_WRAPPER 1
-
-#include_next <linux/percpu.h>
-
-#ifndef percpu_ptr
-#define percpu_ptr per_cpu_ptr
-#endif
-
-#endif /* linux/percpu.h wrapper */