diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 682f2bf2e525..c64f0ddfc982 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -26,8 +26,10 @@ 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[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX }; +const int sysctl_vals[] = { 0, 1, INT_MAX }; EXPORT_SYMBOL(sysctl_vals); +const int android_gki_sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX }; +EXPORT_SYMBOL(android_gki_sysctl_vals); /* Support for permanently empty directories */ diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index c202a72e1690..6ee587d0aeaa 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -38,18 +38,19 @@ struct ctl_table_header; struct ctl_dir; /* Keep the same order as in fs/proc/proc_sysctl.c */ -#define SYSCTL_NEG_ONE ((void *)&sysctl_vals[0]) -#define SYSCTL_ZERO ((void *)&sysctl_vals[1]) -#define SYSCTL_ONE ((void *)&sysctl_vals[2]) -#define SYSCTL_TWO ((void *)&sysctl_vals[3]) -#define SYSCTL_FOUR ((void *)&sysctl_vals[4]) -#define SYSCTL_ONE_HUNDRED ((void *)&sysctl_vals[5]) -#define SYSCTL_TWO_HUNDRED ((void *)&sysctl_vals[6]) -#define SYSCTL_ONE_THOUSAND ((void *)&sysctl_vals[7]) -#define SYSCTL_THREE_THOUSAND ((void *)&sysctl_vals[8]) -#define SYSCTL_INT_MAX ((void *)&sysctl_vals[9]) +#define SYSCTL_NEG_ONE ((void *)&android_gki_sysctl_vals[0]) +#define SYSCTL_ZERO ((void *)&android_gki_sysctl_vals[1]) +#define SYSCTL_ONE ((void *)&android_gki_sysctl_vals[2]) +#define SYSCTL_TWO ((void *)&android_gki_sysctl_vals[3]) +#define SYSCTL_FOUR ((void *)&android_gki_sysctl_vals[4]) +#define SYSCTL_ONE_HUNDRED ((void *)&android_gki_sysctl_vals[5]) +#define SYSCTL_TWO_HUNDRED ((void *)&android_gki_sysctl_vals[6]) +#define SYSCTL_ONE_THOUSAND ((void *)&android_gki_sysctl_vals[7]) +#define SYSCTL_THREE_THOUSAND ((void *)&android_gki_sysctl_vals[8]) +#define SYSCTL_INT_MAX ((void *)&android_gki_sysctl_vals[9]) extern const int sysctl_vals[]; +extern const int android_gki_sysctl_vals[]; typedef int proc_handler(struct ctl_table *ctl, int write, void *buffer, size_t *lenp, loff_t *ppos);