From: Mark Fortescue <mark@xxxxxxxxxxxxxxxxxx>
Date: Sun, 29 Jul 2007 08:55:25 +0100 (BST)
> Yes but then you do a !skip-- so 0 -> -1 and 1 -> 0
Indeed. This is coded in a very non-intuitive manner. The code
selecting the string wants to use the original value of "skip", not
the one modified by the node traversal loop.
Perhaps the following version of the fix is a little clearer.
What do you think?
diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c
index e3a5376..39fbd3c 100644
--- a/arch/sparc/kernel/prom.c
+++ b/arch/sparc/kernel/prom.c
@@ -415,7 +415,7 @@ static void __init of_console_init(void)
unsigned long flags;
const char *type;
phandle node;
- int skip, fd;
+ int skip, tmp, fd;
of_console_path = prom_early_alloc(256);
@@ -442,8 +442,9 @@ static void __init of_console_init(void)
prom_halt();
}
+ tmp = skip;
for_each_node_by_type(dp, type) {
- if (!skip--)
+ if (!tmp--)
break;
}
if (!dp) {
-
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
