diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-11-30 23:26:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-02 18:40:07 -0500 |
| commit | f066a4f6df68f03b565dfe867dde54dfeb26576e (patch) | |
| tree | 16ed85810334bef0f428dbfa52d595e60dacc381 | |
| parent | 86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab (diff) | |
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 <awilliam@redhat.com>
Cc: stable@kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -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 5988debfc505..4051d75dd2d6 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -251,7 +251,7 @@ early_param("loglevel", loglevel); | |||
| 251 | 251 | ||
| 252 | /* | 252 | /* |
| 253 | * Unknown boot options get handed to init, unless they look like | 253 | * Unknown boot options get handed to init, unless they look like |
| 254 | * failed parameters | 254 | * unused parameters (modprobe will find them in /proc/cmdline). |
| 255 | */ | 255 | */ |
| 256 | static int __init unknown_bootoption(char *param, char *val) | 256 | static int __init unknown_bootoption(char *param, char *val) |
| 257 | { | 257 | { |
| @@ -272,14 +272,9 @@ static int __init unknown_bootoption(char *param, char *val) | |||
| 272 | if (obsolete_checksetup(param)) | 272 | if (obsolete_checksetup(param)) |
| 273 | return 0; | 273 | return 0; |
| 274 | 274 | ||
| 275 | /* | 275 | /* Unused module parameter. */ |
| 276 | * Preemptive maintenance for "why didn't my misspelled command | 276 | if (strchr(param, '.') && (!val || strchr(param, '.') < val)) |
| 277 | * line work?" | ||
| 278 | */ | ||
| 279 | if (strchr(param, '.') && (!val || strchr(param, '.') < val)) { | ||
| 280 | printk(KERN_ERR "Unknown boot option `%s': ignoring\n", param); | ||
| 281 | return 0; | 277 | return 0; |
| 282 | } | ||
| 283 | 278 | ||
| 284 | if (panic_later) | 279 | if (panic_later) |
| 285 | return 0; | 280 | return 0; |
