diff options
| author | Eric W. Biederman | 2012-01-06 12:34:20 +0100 |
|---|---|---|
| committer | Eric W. Biederman | 2012-01-25 01:37:54 +0100 |
| commit | de4e83bd6b5e16d491ec068cd22801d5d063b07a (patch) | |
| tree | d6b38f1284186abe5f20cfe996be9a4853c503b4 /fs/proc/proc_sysctl.c | |
| parent | sysctl: Consolidate !CONFIG_SYSCTL handling (diff) | |
| download | kernel-qcow2-linux-de4e83bd6b5e16d491ec068cd22801d5d063b07a.tar.gz kernel-qcow2-linux-de4e83bd6b5e16d491ec068cd22801d5d063b07a.tar.xz kernel-qcow2-linux-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 'fs/proc/proc_sysctl.c')
| -rw-r--r-- | fs/proc/proc_sysctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index d82f4a8b4b80..9d29d28af577 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -468,5 +468,6 @@ int __init proc_sys_init(void) proc_sys_root->proc_iops = &proc_sys_dir_operations; proc_sys_root->proc_fops = &proc_sys_dir_file_operations; proc_sys_root->nlink = 0; - return 0; + + return sysctl_init(); } |