Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 857505fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'moduleparam-for-linus' of... 

Merge tag 'moduleparam-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

Pull minor module param fixes from Rusty Russell:
 "One bugfix for multiple moduleparam levels, one removal of overzealous
  printk."

* tag 'moduleparam-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  init: Drop initcall level output
  module_param: stop double-calling parameters.
parents 48d212a2 19efb72f

include/linux/moduleparam.h

+5 −5
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct kparam_array 
 * The ops can have NULL set or get functions.

 */

#define module_param_cb(name, ops, arg, perm)				      \

	__module_param_call(MODULE_PARAM_PREFIX, name, ops, arg, perm, 0)

	__module_param_call(MODULE_PARAM_PREFIX, name, ops, arg, perm, -1)



/**

 * <level>_param_cb - general callback for a module/cmdline parameter
@@ -192,7 +192,7 @@ struct kparam_array 
		 { (void *)set, (void *)get };				\

	__module_param_call(MODULE_PARAM_PREFIX,			\

			    name, &__param_ops_##name, arg,		\

			    (perm) + sizeof(__check_old_set_param(set))*0, 0)

			    (perm) + sizeof(__check_old_set_param(set))*0, -1)



/* We don't get oldget: it's often a new-style param_get_uint, etc. */

static inline int
@@ -272,7 +272,7 @@ static inline void __kernel_param_unlock(void) 
 */

#define core_param(name, var, type, perm)				\

	param_check_##type(name, &(var));				\

	__module_param_call("", name, &param_ops_##type, &var, perm, 0)

	__module_param_call("", name, &param_ops_##type, &var, perm, -1)

#endif /* !MODULE */



/**
@@ -290,7 +290,7 @@ static inline void __kernel_param_unlock(void) 
		= { len, string };					\

	__module_param_call(MODULE_PARAM_PREFIX, name,			\

			    &param_ops_string,				\

			    .str = &__param_string_##name, perm, 0);	\

			    .str = &__param_string_##name, perm, -1);	\

	__MODULE_PARM_TYPE(name, "string")



/**
@@ -432,7 +432,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp); 
	__module_param_call(MODULE_PARAM_PREFIX, name,			\

			    &param_array_ops,				\

			    .arr = &__param_arr_##name,			\

			    perm, 0);					\

			    perm, -1);					\

	__MODULE_PARM_TYPE(name, "array of " #type)



extern struct kernel_param_ops param_array_ops;

init/main.c

+2 −7
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ asmlinkage void __init start_kernel(void) 
	parse_early_param();

	parse_args("Booting kernel", static_command_line, __start___param,

		   __stop___param - __start___param,

		   0, 0, &unknown_bootoption);

		   -1, -1, &unknown_bootoption);



	jump_label_init();
@@ -755,14 +755,9 @@ static void __init do_initcalls(void) 
{

	int level;



	for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++) {

		pr_info("initlevel:%d=%s, %d registered initcalls\n",

			level, initcall_level_names[level],

			(int) (initcall_levels[level+1]

				- initcall_levels[level]));

	for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++)

		do_initcall_level(level);

}

}



/*

 * Ok, the machine is now initialized. None of the devices