Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761435AbYBPGNz (ORCPT ); Sat, 16 Feb 2008 01:13:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760443AbYBPGNk (ORCPT ); Sat, 16 Feb 2008 01:13:40 -0500 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:42115 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759363AbYBPGNi (ORCPT ); Sat, 16 Feb 2008 01:13:38 -0500 Date: Sat, 16 Feb 2008 01:13:37 -0500 Message-ID: <87bq6ho2cu.wl%ysato@users.sourceforge.jp> From: Yoshinori Sato To: Andrew Morton Cc: lkml Subject: [PATCH 3/6] h8300 setup.c initrd support fix User-Agent: Wanderlust/2.15.5 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.7 Emacs/22.1 (x86_64-pc-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1439 Lines: 39 initrd setting fix. arch/h8300/kernel/setup.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c index b1f25c2..75712ec 100644 --- a/arch/h8300/kernel/setup.c +++ b/arch/h8300/kernel/setup.c @@ -57,6 +57,7 @@ extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end; extern int _ramstart, _ramend; extern char _target_name[]; extern void h8300_gpio_init(void); +extern void *initrd_start, *initrd_end; #if (defined(CONFIG_H8300H_SIM) || defined(CONFIG_H8S_SIM)) \ && defined(CONFIG_GDB_MAGICPRINT) @@ -99,8 +100,8 @@ void __init setup_arch(char **cmdline_p) /* allow for ROMFS on the end of the kernel */ if (memcmp((void *)memory_start, "-rom1fs-", 8) == 0) { #if defined(CONFIG_BLK_DEV_INITRD) - initrd_start = memory_start; - initrd_end = memory_start += be32_to_cpu(((unsigned long *) (memory_start))[2]); + initrd_start = (void *)memory_start; + initrd_end = (void *)(memory_start += be32_to_cpu(((unsigned long *) (memory_start))[2])); #else memory_start += be32_to_cpu(((unsigned long *) memory_start)[2]); #endif -- 1.5.4.1 -- Yoshinori Sato -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/