Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f066a4f6df68f03b565dfe867dde54dfeb26576e

Authored by Rusty Russell
Committed by Linus Torvalds
1 parent 86a7b7ef54
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 8 deletions Side-by-side Diff

... ... @@ -251,7 +251,7 @@
251 251  
252 252 /*
253 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 256 static int __init unknown_bootoption(char *param, char *val)
257 257 {
258 258  
... ... @@ -272,14 +272,9 @@
272 272 if (obsolete_checksetup(param))
273 273 return 0;
274 274  
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))
281 277 return 0;
282   - }
283 278  
284 279 if (panic_later)
285 280 return 0;