From: Adrian Bunk We can now make the following variables static: - drivers/md/md.c: mdp_major - init/main.c: envp_init[] Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- drivers/md/md.c | 2 +- init/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/md/md.c~make-variables-static-after-klibc-merge drivers/md/md.c --- a/drivers/md/md.c~make-variables-static-after-klibc-merge +++ a/drivers/md/md.c @@ -2883,7 +2883,7 @@ static struct kobj_type md_ktype = { .default_attrs = md_default_attrs, }; -int mdp_major = 0; +static int mdp_major = 0; static struct kobject *md_probe(dev_t dev, int *part, void *data) { diff -puN init/main.c~make-variables-static-after-klibc-merge init/main.c --- a/init/main.c~make-variables-static-after-klibc-merge +++ a/init/main.c @@ -160,7 +160,7 @@ static int __init maxcpus(char *str) __setup("maxcpus=", maxcpus); static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; -char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; +static char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; extern struct obs_kernel_param __setup_start[], __setup_end[]; _