Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+7
-12
+5
-5
include/linux/moduleparam.h
+5
-5
include/linux/moduleparam.h
···
128
128
* The ops can have NULL set or get functions.
129
129
*/
130
130
#define module_param_cb(name, ops, arg, perm) \
131
-
__module_param_call(MODULE_PARAM_PREFIX, name, ops, arg, perm, 0)
131
+
__module_param_call(MODULE_PARAM_PREFIX, name, ops, arg, perm, -1)
132
132
133
133
/**
134
134
* <level>_param_cb - general callback for a module/cmdline parameter
···
192
192
{ (void *)set, (void *)get }; \
193
193
__module_param_call(MODULE_PARAM_PREFIX, \
194
194
name, &__param_ops_##name, arg, \
195
-
(perm) + sizeof(__check_old_set_param(set))*0, 0)
195
+
(perm) + sizeof(__check_old_set_param(set))*0, -1)
196
196
197
197
/* We don't get oldget: it's often a new-style param_get_uint, etc. */
198
198
static inline int
···
272
272
*/
273
273
#define core_param(name, var, type, perm) \
274
274
param_check_##type(name, &(var)); \
275
-
__module_param_call("", name, ¶m_ops_##type, &var, perm, 0)
275
+
__module_param_call("", name, ¶m_ops_##type, &var, perm, -1)
276
276
#endif /* !MODULE */
277
277
278
278
/**
···
290
290
= { len, string }; \
291
291
__module_param_call(MODULE_PARAM_PREFIX, name, \
292
292
¶m_ops_string, \
293
-
.str = &__param_string_##name, perm, 0); \
293
+
.str = &__param_string_##name, perm, -1); \
294
294
__MODULE_PARM_TYPE(name, "string")
295
295
296
296
/**
···
432
432
__module_param_call(MODULE_PARAM_PREFIX, name, \
433
433
¶m_array_ops, \
434
434
.arr = &__param_arr_##name, \
435
-
perm, 0); \
435
+
perm, -1); \
436
436
__MODULE_PARM_TYPE(name, "array of " #type)
437
437
438
438
extern struct kernel_param_ops param_array_ops;
+2
-7
init/main.c
+2
-7
init/main.c
···
508
508
parse_early_param();
509
509
parse_args("Booting kernel", static_command_line, __start___param,
510
510
__stop___param - __start___param,
511
-
0, 0, &unknown_bootoption);
511
+
-1, -1, &unknown_bootoption);
512
512
513
513
jump_label_init();
514
514
···
755
755
{
756
756
int level;
757
757
758
-
for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++) {
759
-
pr_info("initlevel:%d=%s, %d registered initcalls\n",
760
-
level, initcall_level_names[level],
761
-
(int) (initcall_levels[level+1]
762
-
- initcall_levels[level]));
758
+
for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++)
763
759
do_initcall_level(level);
764
-
}
765
760
}
766
761
767
762
/*