One bugfix for multiple moduleparam levels, one removal of overzealous printk.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJP0Y2bAAoJENkgDmzRrbjxXRcP/12BTQTs/mbzBW8RvllDbc1o 7QM3si9+/TLI33p+dQHegoAnBbpHO+U13vyG8MfSE/mbBF0Ig1FrskdYAyYm2gDV ket8FDYAXj12zu/1VBntHwedRBt/oIYXiuxhEU5+lyez2GAlZ4iN17tmBnx/xeFl xDajdI2tdpmpD3R2QV2oaruAKpMFI0nC9/Ugx9oJFcKChmMIRB5Jft1VhZOW5JOS 6O+9YE6ui5dC17CeAxsaK9QvEyQ9qci/fWEmHY99WTf8xfeeOZrPSKfG5j3TbiDu ZkZmJoABPPZNLYFxXnIe+iQnml+3aTkAYW36GueC4lDAScVUOLvaFRpA+yPGFgeY muroew3F7TcW99z3yj+rqA+fPP0f/sKVUyuUraaNij9rnoxex+qSrBcgl2+V2wt5 ZF37SI0S+pHs8yZQ96NG6XK32xrlyJmewGlzvv55rSghwmUyOQO+7cK/og7BQu9G E/Z0cA1ui45pd6YF+1gsVySWVA1efIgjszSHB0XhBpCTnHlbaYlw8ccZCskiY14z H+BVHLQX6GSb99YbNMW25PuefJEB6rUDAEzmE495IxJXw6MmzF5hKsBkkNkNrpjq CbbCUeou0kKb81jxZtIzwvxdw+SOtPHDlf0vGsyArJ1Zzdsqulj1xkHGEaORXfHB T32jydLeiWO2aUxtKajd =dSSs -----END PGP SIGNATURE----- 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.
This commit is contained in:
Коммит
857505fae8
|
@ -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, ¶m_ops_##type, &var, perm, 0)
|
||||
__module_param_call("", name, ¶m_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, \
|
||||
¶m_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, \
|
||||
¶m_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;
|
||||
|
|
|
@ -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,13 +755,8 @@ 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);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Загрузка…
Ссылка в новой задаче