Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / net / netfilter / ipvs / ip_vs_est.c

diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
index 0fac6017b6fbc37e522a0bd9d2e39ffd9c31d1b3..6bee6d0c73a52e93e1413162b4db971340fa3312 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_est.c
+++ b/net/netfilter/ipvs/ip_vs_est.c
@@ -56,7 +56,7 @@
  * Make a summary from each cpu
  */
 static void ip_vs_read_cpu_stats(struct ip_vs_stats_user *sum,
-                                struct ip_vs_cpu_stats *stats)
+                                struct ip_vs_cpu_stats __percpu *stats)
 {
        int i;