From 0de9599e3483878062425c305e896d35a70dcfa8 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 1 Dec 2009 14:56:44 +1030 Subject: [PATCH] --- yaml --- r: 169080 b: refs/heads/master c: f066a4f6df68f03b565dfe867dde54dfeb26576e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/init/main.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5e82ffbfb1dc..06f2983d3b7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab +refs/heads/master: f066a4f6df68f03b565dfe867dde54dfeb26576e diff --git a/trunk/init/main.c b/trunk/init/main.c index 5988debfc505..4051d75dd2d6 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -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;