diff options
| -rw-r--r-- | include/linux/moduleparam.h | 2 | ||||
| -rw-r--r-- | init/main.c | 8 | ||||
| -rw-r--r-- | kernel/params.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 9f51568f51c8..6d48831fe7d2 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h | |||
| @@ -161,7 +161,7 @@ __check_old_set_param(int (*oldset)(const char *, struct kernel_param *)) | |||
| 161 | /* Called on module insert or kernel boot */ | 161 | /* Called on module insert or kernel boot */ |
| 162 | extern int parse_args(const char *name, | 162 | extern int parse_args(const char *name, |
| 163 | char *args, | 163 | char *args, |
| 164 | struct kernel_param *params, | 164 | const struct kernel_param *params, |
| 165 | unsigned num, | 165 | unsigned num, |
| 166 | int (*unknown)(char *param, char *val)); | 166 | int (*unknown)(char *param, char *val)); |
| 167 | 167 | ||
diff --git a/init/main.c b/init/main.c index 86cbfd085b01..22d61cb06f98 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -201,11 +201,11 @@ static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; | |||
| 201 | char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; | 201 | char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; |
| 202 | static const char *panic_later, *panic_param; | 202 | static const char *panic_later, *panic_param; |
| 203 | 203 | ||
| 204 | extern struct obs_kernel_param __setup_start[], __setup_end[]; | 204 | extern const struct obs_kernel_param __setup_start[], __setup_end[]; |
| 205 | 205 | ||
| 206 | static int __init obsolete_checksetup(char *line) | 206 | static int __init obsolete_checksetup(char *line) |
| 207 | { | 207 | { |
| 208 | struct obs_kernel_param *p; | 208 | const struct obs_kernel_param *p; |
| 209 | int had_early_param = 0; | 209 | int had_early_param = 0; |
| 210 | 210 | ||
| 211 | p = __setup_start; | 211 | p = __setup_start; |
| @@ -458,7 +458,7 @@ static noinline void __init_refok rest_init(void) | |||
| 458 | /* Check for early params. */ | 458 | /* Check for early params. */ |
| 459 | static int __init do_early_param(char *param, char *val) | 459 | static int __init do_early_param(char *param, char *val) |
| 460 | { | 460 | { |
| 461 | struct obs_kernel_param *p; | 461 | const struct obs_kernel_param *p; |
| 462 | 462 | ||
| 463 | for (p = __setup_start; p < __setup_end; p++) { | 463 | for (p = __setup_start; p < __setup_end; p++) { |
| 464 | if ((p->early && strcmp(param, p->str) == 0) || | 464 | if ((p->early && strcmp(param, p->str) == 0) || |
| @@ -536,7 +536,7 @@ static void __init mm_init(void) | |||
| 536 | asmlinkage void __init start_kernel(void) | 536 | asmlinkage void __init start_kernel(void) |
| 537 | { | 537 | { |
| 538 | char * command_line; | 538 | char * command_line; |
| 539 | extern struct kernel_param __start___param[], __stop___param[]; | 539 | extern const struct kernel_param __start___param[], __stop___param[]; |
| 540 | 540 | ||
| 541 | smp_setup_processor_id(); | 541 | smp_setup_processor_id(); |
| 542 | 542 | ||
diff --git a/kernel/params.c b/kernel/params.c index ef60db14fae0..a3eeeefc9472 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
| @@ -88,7 +88,7 @@ static inline int parameq(const char *input, const char *paramname) | |||
| 88 | 88 | ||
| 89 | static int parse_one(char *param, | 89 | static int parse_one(char *param, |
| 90 | char *val, | 90 | char *val, |
| 91 | struct kernel_param *params, | 91 | const struct kernel_param *params, |
| 92 | unsigned num_params, | 92 | unsigned num_params, |
| 93 | int (*handle_unknown)(char *param, char *val)) | 93 | int (*handle_unknown)(char *param, char *val)) |
| 94 | { | 94 | { |
| @@ -170,7 +170,7 @@ static char *next_arg(char *args, char **param, char **val) | |||
| 170 | /* Args looks like "foo=bar,bar2 baz=fuz wiz". */ | 170 | /* Args looks like "foo=bar,bar2 baz=fuz wiz". */ |
| 171 | int parse_args(const char *name, | 171 | int parse_args(const char *name, |
| 172 | char *args, | 172 | char *args, |
| 173 | struct kernel_param *params, | 173 | const struct kernel_param *params, |
| 174 | unsigned num, | 174 | unsigned num, |
| 175 | int (*unknown)(char *param, char *val)) | 175 | int (*unknown)(char *param, char *val)) |
| 176 | { | 176 | { |
