diff options
author | Vojtech Pavlik <vojtech@suse.cz> | 2004-03-12 02:29:52 +0100 |
---|---|---|
committer | Vojtech Pavlik <vojtech@suse.cz> | 2004-03-12 02:29:52 +0100 |
commit | 7ed820153475a74c46164997cf73941679f46c5c (patch) | |
tree | d2e2f6c5f33235d9c1556406fac2420f644bb646 /init | |
parent | 0a912921292ec744448f9462e46c31928f422f01 (diff) | |
parent | c9d14734db3b79a901bbf46245b62fc391d70b55 (diff) | |
download | history-7ed820153475a74c46164997cf73941679f46c5c.tar.gz |
Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 2059782e8a9ddc..1dac92c3958c7e 100644 --- a/init/main.c +++ b/init/main.c @@ -156,8 +156,11 @@ static int __init obsolete_checksetup(char *line) p = &__setup_start; do { int n = strlen(p->str); - if (!strncmp(line,p->str,n)) { - if (p->setup_func(line+n)) + if (!strncmp(line, p->str, n)) { + if (!p->setup_func) { + printk(KERN_WARNING "Parameter %s is obsolete, ignored\n", p->str); + return 1; + } else if (p->setup_func(line + n)) return 1; } p++; |