| Date | Sun, 06 Dec 2009 16:01:09 -0800 | From | Greg KH <> | Subject | [093/119] param: dont complain about unused module parameters. |
| |
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------ From: Rusty Russell <rusty@rustcorp.com.au>
commit f066a4f6df68f03b565dfe867dde54dfeb26576e upstream.
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 <awilliam@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- init/main.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
--- a/init/main.c +++ b/init/main.c @@ -250,7 +250,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) { @@ -271,14 +271,9 @@ static int __init unknown_bootoption(cha 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;
|