Re: [patch 3/22] __early_param for ppc

[Tom Rini]

On Thu, Mar 25, 2004 at 11:59:38AM +1100, Paul Mackerras wrote:
> trini@xxxxxxxxxxxxxxxxxxx writes:
> 
> > -#ifdef CONFIG_XMON
> > -	xmon_map_scc();
> > -	if (strstr(cmd_line, "xmon"))
> > -		xmon(0);
> > -#endif /* CONFIG_XMON */
> ...
> > +/* Allow us a hook to drop in early. */
> > +static void __init early_xmon(char **ign)
> > +{
> > +	xmon_map_scc();
> > +	xmon(0);
> > +}
> > +__early_param("xmon", early_xmon);
> 
> You have changed the behaviour here, in that now xmon_map_scc() only
> gets called if you put xmon on the command line, whereas previously it
> got called unconditionally (assuming CONFIG_XMON=y).  Did you check
> whether this will cause problems?

Hmm, you're right.  How about the following patch on top of the first
(restore the unconditional call to xmon_map_scc() where it was) ?

--- linux-2.6-early_setup-trini/arch/ppc/kernel/setup.c	2004-03-24 16:15:05.312991415 -0700
+++ linux-2.6-early_setup-trini/arch/ppc/kernel/setup.c	2004-03-24 18:29:27.179336978 -0700
@@ -639,6 +639,10 @@
 		pmac_feature_init();	/* New cool way */
 #endif
 
+#ifdef CONFIG_XMON
+	xmon_map_scc();
+#endif
+
 	if ( ppc_md.progress ) ppc_md.progress("setup_arch: enter", 0x3eab);
 
 	/*
--- linux-2.6-early_setup-trini/arch/ppc/xmon/xmon.c	2004-03-24 16:15:05.316990515 -0700
+++ linux-2.6-early_setup-trini/arch/ppc/xmon/xmon.c	2004-03-24 18:27:52.013643465 -0700
@@ -266,7 +266,6 @@
 /* Allow us a hook to drop in early. */
 static void __init early_xmon(char **ign)
 {
-	xmon_map_scc();
 	xmon(0);
 }
 __early_param("xmon", early_xmon);

-- 
Tom Rini
http://gate.crashing.org/~trini/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/