mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tom Rini <trini@kernel.crashing.org>
To: Paul Mackerras <paulus@samba.org>
Cc: linux-kernel@vger.kernel.org, akpm@osdl.org
Subject: Re: [patch 3/22] __early_param for ppc
Date: Wed, 24 Mar 2004 18:30:16 -0700	[thread overview]
Message-ID: <20040325013016.GB13366@smtp.west.cox.net> (raw)
In-Reply-To: <16482.12026.739450.257677@cargo.ozlabs.ibm.com>

On Thu, Mar 25, 2004 at 11:59:38AM +1100, Paul Mackerras wrote:
> trini@kernel.crashing.org 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/

      reply	other threads:[~2004-03-25  1:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-03-24 23:57 trini
2004-03-25  0:59 ` Paul Mackerras
2004-03-25  1:30   ` Tom Rini [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040325013016.GB13366@smtp.west.cox.net \
    --to=trini@kernel.crashing.org \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®