diff options
| author | Matthew McClintock <msm@freescale.com> | 2010-08-18 23:56:49 -0500 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2010-08-20 17:26:46 +0900 |
| commit | a3e6598138d5b6c34f94b9c036737be8b0249aa3 (patch) | |
| tree | 9509f4c3d1116e2e81e4b0f113364c970fe5d4ac | |
| parent | f8aab8a575b996e568a7ba341bc6dd43c90e361d (diff) | |
Ramdisk address was not copied correctly on kexec'ed kernel
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/ppc/fixup_dtb.c | 2 | ||||
| -rw-r--r-- | 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) { |