From: Matthew McClintock <msm@freescale.com>
To: kexec@lists.infradead.org
Cc: muvarov@gmail.com, linuxppc-dev@ozlabs.org,
Kumar Gala <kumar.gala@freescale.com>,
Sebastian Andrzej Siewior <sebastian@breakpoint.cc>,
Matthew McClintock <msm@freescale.com>
Subject: [PATCH v2 1/3] Ramdisk address was not copied correctly on kexec'ed kernel
Date: Wed, 18 Aug 2010 23:56:49 -0500 [thread overview]
Message-ID: <1282193811-23098-2-git-send-email-msm@freescale.com> (raw)
In-Reply-To: <20100819042023.GC13965@verge.net.au>
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
kexec/arch/ppc/fixup_dtb.c | 2 +-
kexec/arch/ppc/kexec-ppc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kexec/arch/ppc/fixup_dtb.c b/kexec/arch/ppc/fixup_dtb.c
index 26c23a3..09f9ac1 100644
--- a/kexec/arch/ppc/fixup_dtb.c
+++ b/kexec/arch/ppc/fixup_dtb.c
@@ -311,7 +311,7 @@ static void fixup_initrd(char *blob_buf)
return;
}
- tmp = ramdisk_base + ramdisk_size + 1;
+ tmp = ramdisk_base + ramdisk_size;
err = fdt_setprop(blob_buf, nodeoffset,
"linux,initrd-end", &tmp, sizeof(tmp));
if (err < 0) {
diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c
index c36c7b3..ab76d6f 100644
--- a/kexec/arch/ppc/kexec-ppc.c
+++ b/kexec/arch/ppc/kexec-ppc.c
@@ -481,7 +481,7 @@ static int get_devtree_details(unsigned long kexec_flags)
if ((initrd_end - initrd_start) != 0 ) {
initrd_base = initrd_start;
- initrd_size = initrd_end - initrd_start + 1;
+ initrd_size = initrd_end - initrd_start;
}
if (reuse_initrd) {
--
1.6.0.6
next prev parent reply other threads:[~2010-08-19 4:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100819042023.GC13965@verge.net.au>
2010-08-19 4:56 ` [PATCH v2 0/3] Misc. bug fixes for ppc32 Matthew McClintock
2010-08-20 8:27 ` Simon Horman
2010-08-19 4:56 ` Matthew McClintock [this message]
2010-08-19 4:56 ` [PATCH v2 2/3] Prevent multiple reservations for cpu-release-addr Matthew McClintock
2010-08-19 4:56 ` [PATCH v2 3/3] Prevent initrd-start and initrd-end from appearing multiple times Matthew McClintock
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=1282193811-23098-2-git-send-email-msm@freescale.com \
--to=msm@freescale.com \
--cc=kexec@lists.infradead.org \
--cc=kumar.gala@freescale.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=muvarov@gmail.com \
--cc=sebastian@breakpoint.cc \
/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;
as well as URLs for NNTP newsgroup(s).