linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] kexec-tools: remove initrd_found
@ 2007-04-18  7:02 Michael Neuling
  2007-04-18  7:24 ` Simon Horman
  0 siblings, 1 reply; 2+ messages in thread
From: Michael Neuling @ 2007-04-18  7:02 UTC (permalink / raw)
  To: Fastboot mailing list; +Cc: linuxppc-dev, horms

initrd_found is not used, so remove it.  Minor cleanup. 

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
Horms: this applies to your testing tree.

 kexec/arch/ppc64/fs2dt.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Index: kexec-tools-testing/kexec/arch/ppc64/fs2dt.c
===================================================================
--- kexec-tools-testing.orig/kexec/arch/ppc64/fs2dt.c
+++ kexec-tools-testing/kexec/arch/ppc64/fs2dt.c
@@ -43,7 +43,6 @@ static char propnames[NAMESPACE] = { 0 }
 static unsigned dtstruct[TREEWORDS], *dt;
 static unsigned long long mem_rsrv[2*MEMRESERVE] = { 0, 0 };
 
-static int initrd_found = 0;
 static int crash_param = 0;
 static char local_cmdline[COMMAND_LINE_SIZE] = { "" };
 static unsigned *dt_len; /* changed len of modified cmdline
@@ -343,10 +342,8 @@ static void putnode(void)
 
 	putprops(dn, namelist, numlist);
 
-	/* Add initrd entries to the second kernel if first kernel does not
-	 * have and second kernel needs.
-	 */
-	if (initrd_base && !initrd_found && !strcmp(basename,"/chosen/")) {
+	/* Add initrd entries to the second kernel */
+	if (initrd_base && !strcmp(basename,"/chosen/")) {
 		int len = 8;
 		unsigned long long initrd_end;
 		*dt++ = 3;

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] kexec-tools: remove initrd_found
  2007-04-18  7:02 [PATCH] kexec-tools: remove initrd_found Michael Neuling
@ 2007-04-18  7:24 ` Simon Horman
  0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2007-04-18  7:24 UTC (permalink / raw)
  To: Michael Neuling; +Cc: linuxppc-dev, Fastboot mailing list

On Wed, Apr 18, 2007 at 05:02:01PM +1000, Michael Neuling wrote:
> initrd_found is not used, so remove it.  Minor cleanup. 

Thanks, applied.

-- 
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-04-18  7:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-18  7:02 [PATCH] kexec-tools: remove initrd_found Michael Neuling
2007-04-18  7:24 ` Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).