Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34

[firefly-linux-kernel-4.4.55.git] / net / unix / sysctl_net_unix.c

diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 708f5df6b7f08e7217ce7a1f2a89f83b856b1ddd..d095c7be10d03bd1514e8fae584a3b31cc30d5ce 100644 (file)
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -31,7 +31,7 @@ static struct ctl_path unix_path[] = {
        { },
 };
 
-int unix_sysctl_register(struct net *net)
+int __net_init unix_sysctl_register(struct net *net)
 {
        struct ctl_table *table;