lkml.org 
[lkml]   [2008]   [Feb]   [16]   [last100]   RSS Feed
Views: [more markup]   [less markup]   [headers]   [forward]  
 
Messages in this thread
/
DateFri, 15 Feb 2008 22:29:49 -0800
FromAndrew Morton <>
SubjectRe: [PATCH 3/6] h8300 setup.c initrd support fix
On Sat, 16 Feb 2008 01:13:37 -0500 Yoshinori Sato <ysato@users.sourceforge.jp> wrote:

> 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

But include/linux/initrd.h declares:

	extern unsigned long initrd_start, initrd_end;

--
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/

\
 
 \ /
  Last update: 2008-02-16 06:33    [from the cache]
©2003-2008