lkml.org 
[lkml]   [2006]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH]: typo in init/initramfs.c
From
Date
linux-kernel-owner@vger.kernel.org wrote on 06-12-2006 19:17:27:

> Jean-Paul Saman wrote:
> >
> > In populate_rootfs() the printk on line 554. It says "Unpacking
> > initramfs..", which is confusing because if that line is reached the
code
> > has already decided that the image is an initrd image.
>
> Are you sure?

Yes.

>
> > The printk is thus
> > wrong in stating that it is unpacking an "initramfs". It should says
> > "initrd" instead. The attached patch corrects this typo.
> >
> > Signed-off-by: Jean-Paul Saman <jean-paul.saman@nxp.com>
> >
> > diff --git a/init/initramfs.c b/init/initramfs.c
> > index d28c109..f6020db 100644
> > --- a/init/initramfs.c
> > +++ b/init/initramfs.c
> > @@ -551,7 +551,7 @@ #ifdef CONFIG_BLK_DEV_RAM
>
> This is where initramfs is discerned from initrd, as both are available.
>
> > free_initrd();
> > }
> > #else
>
> Otherwise it's initramfs only.

No otherwise it falls under CONFIG_BLK_DEV_INITRD and it that suggests it
must be a initrd, not a initramfs as the original printk() suggests.

>
> > - printk(KERN_INFO "Unpacking initramfs...");
> > + printk(KERN_INFO "Unpacking initrd...");
> > err = unpack_to_rootfs((char *)initrd_start,
> > initrd_end - initrd_start, 0);
> > if (err)
> >
> > -

Kind greetings,

Jean-Paul Saman

NXP Semiconductors CTO/RTG DesignIP
-
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: 2006-12-08 09:35    [W:0.045 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site