diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/sysctl_net.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/sysctl_net.c')
| -rw-r--r-- | net/sysctl_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 0b15d7250c40..53196009160a 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c | |||
| @@ -71,7 +71,7 @@ static struct ctl_table_root net_sysctl_ro_root = { | |||
| 71 | .permissions = net_ctl_ro_header_perms, | 71 | .permissions = net_ctl_ro_header_perms, |
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | static int sysctl_net_init(struct net *net) | 74 | static int __net_init sysctl_net_init(struct net *net) |
| 75 | { | 75 | { |
| 76 | setup_sysctl_set(&net->sysctls, | 76 | setup_sysctl_set(&net->sysctls, |
| 77 | &net_sysctl_ro_root.default_set, | 77 | &net_sysctl_ro_root.default_set, |
| @@ -79,7 +79,7 @@ static int sysctl_net_init(struct net *net) | |||
| 79 | return 0; | 79 | return 0; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | static void sysctl_net_exit(struct net *net) | 82 | static void __net_exit sysctl_net_exit(struct net *net) |
| 83 | { | 83 | { |
| 84 | WARN_ON(!list_empty(&net->sysctls.list)); | 84 | WARN_ON(!list_empty(&net->sysctls.list)); |
| 85 | return; | 85 | return; |