aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sysctl.h
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-01-08 03:02:37 -0500
committerEric W. Biederman <ebiederm@xmission.com>2012-01-24 19:40:30 -0500
commit60a47a2e823cbe6b609346bffff61a00c0c76470 (patch)
treeb19ac63068757893d6f110cf31d27fb59942d005 /include/linux/sysctl.h
parent0e47c99d7fe25e0f3907d9f3401079169d904891 (diff)
sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy
An nsproxy argument here has always been awkard and now the nsproxy argument is completely unnecessary so remove it, replacing it with the set we want the registered tables to show up in. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/sysctl.h')
-rw-r--r--include/linux/sysctl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 2a1446a96094..cec59415b3ce 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -1079,10 +1079,10 @@ extern void retire_sysctl_set(struct ctl_table_set *set);
1079 1079
1080void register_sysctl_root(struct ctl_table_root *root); 1080void register_sysctl_root(struct ctl_table_root *root);
1081struct ctl_table_header *__register_sysctl_table( 1081struct ctl_table_header *__register_sysctl_table(
1082 struct ctl_table_root *root, struct nsproxy *namespaces, 1082 struct ctl_table_set *set,
1083 const char *path, struct ctl_table *table); 1083 const char *path, struct ctl_table *table);
1084struct ctl_table_header *__register_sysctl_paths( 1084struct ctl_table_header *__register_sysctl_paths(
1085 struct ctl_table_root *root, struct nsproxy *namespaces, 1085 struct ctl_table_set *set,
1086 const struct ctl_path *path, struct ctl_table *table); 1086 const struct ctl_path *path, struct ctl_table *table);
1087struct ctl_table_header *register_sysctl_table(struct ctl_table * table); 1087struct ctl_table_header *register_sysctl_table(struct ctl_table * table);
1088struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path, 1088struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path,