diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-12-16 16:15:48 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-12-16 16:15:48 +0100 |
| commit | 43c45e8cf8fa805bba35f26f18fefb75365b7ac4 (patch) | |
| tree | 457e39f9f2f73b1d78a787ca8543d9bed3bc84a0 /init | |
| parent | bfc0636c50a715ad8dccc4f10923ce3162271a51 (diff) | |
| parent | 047e5f383505cda6606b73d49a857895de5e2c48 (diff) | |
| download | lwn-43c45e8cf8fa805bba35f26f18fefb75365b7ac4.tar.gz lwn-43c45e8cf8fa805bba35f26f18fefb75365b7ac4.zip | |
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.31.y
into rt/2.6.31
Conflicts:
Makefile
kernel/perf_counter.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
| -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 ff438b198fe3..d26de40db08b 100644 --- a/init/main.c +++ b/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; |