Skip to content

Commit f066a4f

Browse files
rustyrusselltorvalds
authored andcommitted
param: don't complain about unused module parameters.
Jon confirms that recent modprobe will look in /proc/cmdline, so these cmdline options can still be used. See http://bugzilla.kernel.org/show_bug.cgi?id=14164 Reported-by: Adam Williamson <[email protected]> Cc: [email protected] Signed-off-by: Rusty Russell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 86a7b7e commit f066a4f

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

init/main.c

+3-8
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ early_param("loglevel", loglevel);
251251

252252
/*
253253
* Unknown boot options get handed to init, unless they look like
254-
* failed parameters
254+
* unused parameters (modprobe will find them in /proc/cmdline).
255255
*/
256256
static int __init unknown_bootoption(char *param, char *val)
257257
{
@@ -272,14 +272,9 @@ static int __init unknown_bootoption(char *param, char *val)
272272
if (obsolete_checksetup(param))
273273
return 0;
274274

275-
/*
276-
* Preemptive maintenance for "why didn't my misspelled command
277-
* line work?"
278-
*/
279-
if (strchr(param, '.') && (!val || strchr(param, '.') < val)) {
280-
printk(KERN_ERR "Unknown boot option `%s': ignoring\n", param);
275+
/* Unused module parameter. */
276+
if (strchr(param, '.') && (!val || strchr(param, '.') < val))
281277
return 0;
282-
}
283278

284279
if (panic_later)
285280
return 0;

0 commit comments

Comments
 (0)