aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2004-03-16 13:10:38 +0100
committerVojtech Pavlik <vojtech@suse.cz>2004-03-16 13:10:38 +0100
commitbe7b81930881facd50767fb7d1d55987d1c0498b (patch)
tree52e776dcd483fb97de652f51503d425a2a40d568 /init
parentd3fdc9acc701b67fabe641fb868882574b9827c6 (diff)
parentbf9b7f73a2ce2ecf08e136ec2295c86a639c6c91 (diff)
downloadhistory-be7b81930881facd50767fb7d1d55987d1c0498b.tar.gz
Merge suse.cz:/data/bk/linus into suse.cz:/data/bk/input
Diffstat (limited to 'init')
-rw-r--r--init/main.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index 7e73a1c3c5e7f5..07f94366efcada 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++;