diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-18 12:31:55 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-18 12:31:55 +1000 |
commit | fe7ab7537e6ae55240fa3973bda09d285a585113 (patch) | |
tree | acf11b91e7bb3bb6729056f39e56a8ee23c73c23 /init | |
parent | fe44c62add9c853c341c64cebc5ecb54a52778f1 (diff) | |
parent | 23ca86e2f77dbec6c50fee8d082d7bdefaec5418 (diff) |
Merge branch 'quilt/rr'
Conflicts:
drivers/net/virtio_net.c
drivers/net/wireless/libertas_tf/if_usb.c
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c index 5c8540271529..f3d20418fc80 100644 --- a/init/main.c +++ b/init/main.c @@ -201,11 +201,11 @@ static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; 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[]; +extern const struct obs_kernel_param __setup_start[], __setup_end[]; static int __init obsolete_checksetup(char *line) { - struct obs_kernel_param *p; + const struct obs_kernel_param *p; int had_early_param = 0; p = __setup_start; @@ -451,7 +451,7 @@ static noinline void __init_refok rest_init(void) /* Check for early params. */ static int __init do_early_param(char *param, char *val) { - struct obs_kernel_param *p; + const struct obs_kernel_param *p; for (p = __setup_start; p < __setup_end; p++) { if ((p->early && strcmp(param, p->str) == 0) || @@ -528,7 +528,7 @@ static void __init mm_init(void) asmlinkage void __init start_kernel(void) { char * command_line; - extern struct kernel_param __start___param[], __stop___param[]; + extern const struct kernel_param __start___param[], __stop___param[]; smp_setup_processor_id(); |