Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...

[cascardo/linux.git] / net / dccp / proto.c

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index f9076f2..f440cc7 100644 (file)
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -1084,14 +1084,15 @@ EXPORT_SYMBOL_GPL(dccp_shutdown);
 
 static inline int dccp_mib_init(void)
 {
-       return snmp_mib_init((void __percpu **)dccp_statistics,
-                            sizeof(struct dccp_mib),
-                            __alignof__(struct dccp_mib));
+       dccp_statistics = alloc_percpu(struct dccp_mib);
+       if (!dccp_statistics)
+               return -ENOMEM;
+       return 0;
 }
 
 static inline void dccp_mib_exit(void)
 {
-       snmp_mib_free((void __percpu **)dccp_statistics);
+       free_percpu(dccp_statistics);
 }
 
 static int thash_entries;