diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2012-01-06 03:34:20 -0800 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-01-24 16:37:54 -0800 |
| commit | de4e83bd6b5e16d491ec068cd22801d5d063b07a (patch) | |
| tree | d6b38f1284186abe5f20cfe996be9a4853c503b4 /include/linux/sysctl.h | |
| parent | sysctl: Consolidate !CONFIG_SYSCTL handling (diff) | |
| download | linux-dev-de4e83bd6b5e16d491ec068cd22801d5d063b07a.tar.xz linux-dev-de4e83bd6b5e16d491ec068cd22801d5d063b07a.zip | |
sysctl: Register the base sysctl table like any other sysctl table.
Simplify the code by treating the base sysctl table like any other
sysctl table and register it with register_sysctl_table.
To ensure this table is registered early enough to avoid problems
call sysctl_init from proc_sys_init.
Rename sysctl_net.c:sysctl_init() to net_sysctl_init() to avoid
name conflicts now that kernel/sysctl.c:sysctl_init() is no longer
static.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index cf3ee7f246d6..5e3532e9599f 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -1095,6 +1095,7 @@ struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path, void unregister_sysctl_table(struct ctl_table_header * table); int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table); +extern int sysctl_init(void); #else /* CONFIG_SYSCTL */ static inline struct ctl_table_header *register_sysctl_table(struct ctl_table * table) { |