lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Linus Torvalds
2012-06-08 09:10:35 -07:00
parent 48d212a2ee 19efb72fdc
commit 857505fae8
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/moduleparam.h
View File

@@ -128,7 +128,7 @@ struct kparam_array
* The ops can have NULL set or get functions. * The ops can have NULL set or get functions.
*/ */
#define module_param_cb(name, ops, arg, perm) \ #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 * <level>_param_cb - general callback for a module/cmdline parameter
@@ -192,7 +192,7 @@ struct kparam_array
{ (void *)set, (void *)get }; \ { (void *)set, (void *)get }; \
__module_param_call(MODULE_PARAM_PREFIX, \ __module_param_call(MODULE_PARAM_PREFIX, \
name, &__param_ops_##name, arg, \ 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. */ /* We don't get oldget: it's often a new-style param_get_uint, etc. */
static inline int static inline int
@@ -272,7 +272,7 @@ static inline void __kernel_param_unlock(void)
*/ */
#define core_param(name, var, type, perm) \ #define core_param(name, var, type, perm) \
param_check_##type(name, &(var)); \ 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 */ #endif /* !MODULE */
/** /**
@@ -290,7 +290,7 @@ static inline void __kernel_param_unlock(void)
= { len, string }; \ = { len, string }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \ __module_param_call(MODULE_PARAM_PREFIX, name, \
&param_ops_string, \ &param_ops_string, \
.str = &__param_string_##name, perm, 0); \ .str = &__param_string_##name, perm, -1); \
__MODULE_PARM_TYPE(name, "string") __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, \ __module_param_call(MODULE_PARAM_PREFIX, name, \
&param_array_ops, \ &param_array_ops, \
.arr = &__param_arr_##name, \ .arr = &__param_arr_##name, \
perm, 0); \ perm, -1); \
__MODULE_PARM_TYPE(name, "array of " #type) __MODULE_PARM_TYPE(name, "array of " #type)
extern struct kernel_param_ops param_array_ops; extern struct kernel_param_ops param_array_ops;

9
init/main.c
View File

@@ -508,7 +508,7 @@ asmlinkage void __init start_kernel(void)
parse_early_param(); parse_early_param();
parse_args("Booting kernel", static_command_line, __start___param, parse_args("Booting kernel", static_command_line, __start___param,
__stop___param - __start___param, __stop___param - __start___param,
0, 0, &unknown_bootoption); -1, -1, &unknown_bootoption);
jump_label_init(); jump_label_init();
@@ -755,13 +755,8 @@ static void __init do_initcalls(void)
{ {
int level; int level;
for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; 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]));
do_initcall_level(level); do_initcall_level(level);
}
} }
/* /*