Per-device parameter support (10/16)
dp_10_module_param_unknown_arg.diff
This is the 10th patch of 16 patches for devparam.
The @unknown function of parse_args() is changed to take a void *arg.
This is used by devparam.
Signed-off-by Tejun Heo <[email protected]>
include/linux/moduleparam.h +2 -1
@@ -108,7 +108,8 @@ extern int parse_args(const char *name,char *args, struct kernel_param *params, unsigned num, - int (*unknown)(char *param, char *val)); + int (*unknown)(char *param, char *val, void *arg), + void *uarg);/* All the helper functions */ /* The macros to do compile-time type checking stolen from Jakub
init/main.c +4 -4
@@ -283,7 +283,7 @@ __setup("quiet", quiet_kernel);* Unknown boot options get handed to init, unless they look like * failed parameters */ -static int __init unknown_bootoption (char *param,char *val) +static int __init unknown_bootoption (char *param,char *val,void *arg) {/* Change NUL term back to "=", to make "param" the whole string. */ if (val) {
@@ -441,7 +441,7 @@ static void noinline rest_init(void) }/* Check for early params. */ -static int __init do_early_param (char *param,char *val) +static int __init do_early_param (char *param,char *val,void *arg) {struct obs_kernel_param *p;extern struct obs_kernel_param __setup_start, __setup_end;
@@ -468,7 +468,7 @@ void __init parse_early_param(void)/* All fall through to do_early_param. */ strlcpy (tmp_cmdline, saved_command_line,COMMAND_LINE_SIZE ); -parse_args ("early options" , tmp_cmdline,NULL ,0 , do_early_param); +parse_args ("early options" , tmp_cmdline,NULL ,0 , do_early_param,NULL ); done =1 ; }
@@ -508,7 +508,7 @@ asmlinkage void __init start_kernel(voidparse_early_param ();parse_args ("Booting kernel" , command_line, __start___param, __stop___param - __start___param, - &unknown_bootoption); + &unknown_bootoption,NULL );sort_main_extable ();trap_init ();rcu_init ();
kernel/module.c +2 -2
@@ -827,7 +827,7 @@ static int obsolete_params(const char *n kp[i].arg = &obsparm[i]; } - ret =parse_args (name, args, kp, num,NULL ); + ret =parse_args (name, args, kp, num,NULL ,NULL ); out:kfree (kp);return ret;
@@ -1780,7 +1780,7 @@ static struct module *load_module(void _ sechdrs[setupindex].sh_addr, sechdrs[setupindex].sh_size /sizeof (struct kernel_param ), - NULL); + NULL, NULL); } err = mod_sysfs_setup(mod, (struct kernel_param *)
kernel/params.c +5 -4
@@ -47,7 +47,8 @@ static int parse_one(char *param,char *val, struct kernel_param *params, unsigned num_params, - int (*handle_unknown)(char *param, char *val)) + int (*handle_unknown)(char *param, char *val, void *arg), + void *uarg) { unsigned int i;
@@ -62,7 +63,7 @@ static int parse_one(char *param,if (handle_unknown) {DEBUGP ("Unknown argument: calling %p\n" , handle_unknown); -return handle_unknown (param, val); +return handle_unknown (param, val, uarg); }DEBUGP ("Unknown argument `%s'\n" , param);
@@ -117,7 +118,7 @@ int parse_args(const char *name,char *args, struct kernel_param *params, unsigned num, - int (*unknown)(char *param, char *val)) + int (*unknown)(char *param, char *val, void *arg), void *uarg) { char *param, *val;
@@ -127,7 +128,7 @@ int parse_args(const char *name,int ret; args =param_next_arg (args, ¶m, &val); - ret =parse_one (param, val, params, num, unknown); + ret =parse_one (param, val, params, num, unknown, uarg);switch (ret) {case -ENOENT : printk(KERN_ERR "%s: Unknown parameter `%s'\n",