summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2007-04-18 17:02:01 +1000
committerSimon Horman <horms@verge.net.au>2007-04-18 16:21:56 +0900
commitb42483a7f148456186212abed9d3c4b2535d1d60 (patch)
treea0f02ac2003b82e186d87254fb01ba6da8e9d006
parent0ed5c286ef2d83a55d1b2aff2c153ac95f9744ea (diff)
kexec-tools: remove initrd_found
initrd_found is not used, so remove it. Minor cleanup. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--kexec/arch/ppc64/fs2dt.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kexec/arch/ppc64/fs2dt.c b/kexec/arch/ppc64/fs2dt.c
index 61a3638..71b4b12 100644
--- a/kexec/arch/ppc64/fs2dt.c
+++ b/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;