Commit b13bc7cb authored by Liu Shixin's avatar Liu Shixin Committed by Luis Chamberlain
Browse files

kernel/sysctl.c: move sysctl_vals and sysctl_long_vals to sysctl.c 



sysctl_vals and sysctl_long_vals are declared even if sysctl is disabled.
Move its definition to sysctl.c to make sure their integrity in any case.

Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent feb2bd01

fs/proc/proc_sysctl.c

+0 −7
Original line number Diff line number Diff line
@@ -28,13 +28,6 @@ static const struct inode_operations proc_sys_inode_operations; 
static const struct file_operations proc_sys_dir_file_operations;

static const struct inode_operations proc_sys_dir_operations;



/* shared constants to be used in various sysctls */

const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };

EXPORT_SYMBOL(sysctl_vals);



const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };

EXPORT_SYMBOL_GPL(sysctl_long_vals);



/* Support for permanently empty directories */



struct ctl_table sysctl_mount_point[] = {

kernel/sysctl.c

+8 −1
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ 
#include <linux/rtmutex.h>

#endif



/* shared constants to be used in various sysctls */

const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };

EXPORT_SYMBOL(sysctl_vals);



const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };

EXPORT_SYMBOL_GPL(sysctl_long_vals);



#if defined(CONFIG_SYSCTL)



/* Constants used for minimum and maximum */