From patchwork Thu Aug 19 04:56:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew McClintock X-Patchwork-Id: 62106 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 0272DB7318 for ; Thu, 19 Aug 2010 14:57:24 +1000 (EST) Received: by ozlabs.org (Postfix) id 82F9DB70D4; Thu, 19 Aug 2010 14:57:15 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from TX2EHSOBE004.bigfish.com (tx2ehsobe002.messaging.microsoft.com [65.55.88.12]) by ozlabs.org (Postfix) with ESMTP id 1873BB6EF1 for ; Thu, 19 Aug 2010 14:57:14 +1000 (EST) Received: from mail108-tx2-R.bigfish.com (10.9.14.235) by TX2EHSOBE004.bigfish.com (10.9.40.24) with Microsoft SMTP Server id 8.1.340.0; Thu, 19 Aug 2010 04:57:11 +0000 Received: from mail108-tx2 (localhost.localdomain [127.0.0.1]) by mail108-tx2-R.bigfish.com (Postfix) with ESMTP id 5FB8533006B; Thu, 19 Aug 2010 04:57:11 +0000 (UTC) X-SpamScore: 3 X-BigFish: VS3(zzzz1202h1082kzz8275bhz2dh2a8h) Received: from mail108-tx2 (localhost.localdomain [127.0.0.1]) by mail108-tx2 (MessageSwitch) id 1282193831244635_21587; Thu, 19 Aug 2010 04:57:11 +0000 (UTC) Received: from TX2EHSMHS031.bigfish.com (unknown [10.9.14.240]) by mail108-tx2.bigfish.com (Postfix) with ESMTP id 37D27129004D; Thu, 19 Aug 2010 04:57:11 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by TX2EHSMHS031.bigfish.com (10.9.99.131) with Microsoft SMTP Server (TLS) id 14.0.482.44; Thu, 19 Aug 2010 04:57:11 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id o7J4usPX002416; Wed, 18 Aug 2010 21:57:05 -0700 (MST) Received: from localhost.localdomain (blarg.am.freescale.net [10.82.123.10]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id o7J58ceP021414; Thu, 19 Aug 2010 00:08:40 -0500 (CDT) From: Matthew McClintock To: kexec@lists.infradead.org Subject: [PATCH v2 1/3] Ramdisk address was not copied correctly on kexec'ed kernel Date: Wed, 18 Aug 2010 23:56:49 -0500 Message-ID: <1282193811-23098-2-git-send-email-msm@freescale.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <20100819042023.GC13965@verge.net.au> References: <20100819042023.GC13965@verge.net.au> MIME-Version: 1.0 X-Reverse-DNS: az33egw02.freescale.net Cc: muvarov@gmail.com, linuxppc-dev@ozlabs.org, Kumar Gala , Sebastian Andrzej Siewior , Matthew McClintock X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Signed-off-by: Matthew McClintock --- 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) {