diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-12-01 14:56:44 +1030 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-08 10:22:20 -0800 |
| commit | 96433ac605f72599f99f1300f56a57316f10d532 (patch) | |
| tree | 128b887c2d369b6ff567fca00fda7fd6ce0ef1b6 | |
| parent | 9530e63015d1627cb46a485f7e6b8ba83ec4dca7 (diff) | |
param: don't complain about unused module parameters.
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>
| -rw-r--r-- | init/main.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/init/main.c b/init/main.c index 11f4f145be3f..1ec6347ee332 100644 --- 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(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; |