From a4c36edda1a7e9fb137d14c68d3675d8202aa778 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 26 Sep 2006 10:52:32 +0200
Subject: [PATCH] --- yaml --- r: 35849 b: refs/heads/master c:
 33df0d19ea425d28bd5afb48898af32237fe81af h: refs/heads/master i:   35847:
 31d7ca93f9b455294494ef53871991d3f3f9a866 v: v3

---
 [refs]            |  2 +-
 trunk/init/main.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7bcfceb2fd2d..0172e3664b3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ca33eb6981549c0d1b7aea7f99f1ba602161356
+refs/heads/master: 33df0d19ea425d28bd5afb48898af32237fe81af
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 8651a720a092..6b69564738c1 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -162,16 +162,19 @@ extern struct obs_kernel_param __setup_start[], __setup_end[];
 static int __init obsolete_checksetup(char *line)
 {
 	struct obs_kernel_param *p;
+	int had_early_param = 0;
 
 	p = __setup_start;
 	do {
 		int n = strlen(p->str);
 		if (!strncmp(line, p->str, n)) {
 			if (p->early) {
-				/* Already done in parse_early_param?  (Needs
-				 * exact match on param part) */
+				/* Already done in parse_early_param?
+				 * (Needs exact match on param part).
+				 * Keep iterating, as we can have early
+				 * params and __setups of same names 8( */
 				if (line[n] == '\0' || line[n] == '=')
-					return 1;
+					had_early_param = 1;
 			} else if (!p->setup_func) {
 				printk(KERN_WARNING "Parameter %s is obsolete,"
 				       " ignored\n", p->str);
@@ -181,7 +184,8 @@ static int __init obsolete_checksetup(char *line)
 		}
 		p++;
 	} while (p < __setup_end);
-	return 0;
+
+	return had_early_param;
 }
 
 /*