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

Commit f066a4f6 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds
Browse files

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: default avatarAdam Williamson <awilliam@redhat.com>
Cc: stable@kernel.org
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 86a7b7ef

init/main.c

+3 −8
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ early_param("loglevel", loglevel); 


/*

 * Unknown boot options get handed to init, unless they look like

 * failed parameters

 * unused parameters (modprobe will find them in /proc/cmdline).

 */

static int __init unknown_bootoption(char *param, char *val)

{
@@ -272,14 +272,9 @@ static int __init unknown_bootoption(char *param, char *val) 
	if (obsolete_checksetup(param))

		return 0;



	/*

	 * Preemptive maintenance for "why didn't my misspelled command

	 * line work?"

	 */

	if (strchr(param, '.') && (!val || strchr(param, '.') < val)) {

		printk(KERN_ERR "Unknown boot option `%s': ignoring\n", param);

	/* Unused module parameter. */

	if (strchr(param, '.') && (!val || strchr(param, '.') < val))

		return 0;

	}



	if (panic_later)

		return 0;