@@ -328,6 +328,7 @@ extern char *parse_args(const char *name,
s16 level_max,
void *arg,
int (*unknown)(char *param, char *val,
+ char *currant, char *next,
const char *doing, void *arg));
/* Called by module remove. */
@@ -241,6 +241,7 @@ early_param("loglevel", loglevel);
/* Change NUL term back to "=", to make "param" the whole string. */
static int __init repair_env_string(char *param, char *val,
+ char *unused3, char *unused2,
const char *unused, void *arg)
{
if (val) {
@@ -259,6 +260,7 @@ static int __init repair_env_string(char *param, char *val,
/* Anything after -- gets handed straight to init. */
static int __init set_init_arg(char *param, char *val,
+ char *unused3, char *unused2,
const char *unused, void *arg)
{
unsigned int i;
@@ -266,7 +268,7 @@ static int __init set_init_arg(char *param, char *val,
if (panic_later)
return 0;
- repair_env_string(param, val, unused, NULL);
+ repair_env_string(param, val, unused3, unused2, unused, NULL);
for (i = 0; argv_init[i]; i++) {
if (i == MAX_INIT_ARGS) {
@@ -284,9 +286,10 @@ static int __init set_init_arg(char *param, char *val,
* unused parameters (modprobe will find them in /proc/cmdline).
*/
static int __init unknown_bootoption(char *param, char *val,
+ char *unused3, char *unused2,
const char *unused, void *arg)
{
- repair_env_string(param, val, unused, NULL);
+ repair_env_string(param, val, unused3, unused2, unused, NULL);
/* Handle obsolete-style parameters */
if (obsolete_checksetup(param))
@@ -438,6 +441,7 @@ static noinline void __ref rest_init(void)
/* Check for early params. */
static int __init do_early_param(char *param, char *val,
+ char *unused3, char *unused2,
const char *unused, void *arg)
{
const struct obs_kernel_param *p;
@@ -3619,8 +3619,9 @@ static int prepare_coming_module(struct module *mod)
return 0;
}
-static int unknown_module_param_cb(char *param, char *val, const char *modname,
- void *arg)
+static int unknown_module_param_cb(char *param, char *val,
+ char *unused, char *unused2,
+ const char *modname, void *arg)
{
struct module *mod = arg;
int ret;
@@ -119,6 +119,8 @@ static void param_check_unsafe(const struct kernel_param *kp)
static int parse_one(char *param,
char *val,
+ char *currant,
+ char *next,
const char *doing,
const struct kernel_param *params,
unsigned num_params,
@@ -126,7 +128,8 @@ static int parse_one(char *param,
s16 max_level,
void *arg,
int (*handle_unknown)(char *param, char *val,
- const char *doing, void *arg))
+ char *currant, char *next,
+ const char *doing, void *arg))
{
unsigned int i;
int err;
@@ -153,7 +156,7 @@ static int parse_one(char *param,
if (handle_unknown) {
pr_debug("doing %s: %s='%s'\n", doing, param, val);
- return handle_unknown(param, val, doing, arg);
+ return handle_unknown(param, val, currant, next, doing, arg);
}
pr_debug("Unknown argument '%s'\n", param);
@@ -169,9 +172,10 @@ char *parse_args(const char *doing,
s16 max_level,
void *arg,
int (*unknown)(char *param, char *val,
+ char *currant, char *next,
const char *doing, void *arg))
{
- char *param, *val, *err = NULL;
+ char *param, *val, *next, *err = NULL;
/* Chew leading spaces */
args = skip_spaces(args);
@@ -179,16 +183,18 @@ char *parse_args(const char *doing,
if (*args)
pr_debug("doing %s, parsing ARGS: '%s'\n", doing, args);
- while (*args) {
+ next = next_arg(args, ¶m, &val);
+ while (*next) {
int ret;
int irq_was_disabled;
- args = next_arg(args, ¶m, &val);
+ args = next;
+ next = next_arg(args, ¶m, &val);
/* Stop at -- */
if (!val && strcmp(param, "--") == 0)
return err ?: args;
irq_was_disabled = irqs_disabled();
- ret = parse_one(param, val, doing, params, num,
+ ret = parse_one(param, val, args, next, doing, params, num,
min_level, max_level, arg, unknown);
if (irq_was_disabled && !irqs_disabled())
pr_warn("%s: option '%s' enabled irq's!\n",
@@ -889,6 +889,7 @@ static int ddebug_dyndbg_param_cb(char *param, char *val,
/* handle both dyndbg and $module.dyndbg params at boot */
static int ddebug_dyndbg_boot_param_cb(char *param, char *val,
+ char *unused3, char *unused2,
const char *unused, void *arg)
{
vpr_info("%s=\"%s\"\n", param, val);