LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Michael Neuling <mikey@neuling.org>
Cc: linux-kernel@vger.kernel.org, H Peter Anvin <hpa@zytor.com>,
Andrew Morton <akpm@osdl.org>, Al Viro <viro@ftp.linux.org.uk>
Subject: Re: [PATCH] free initrds boot option
Date: Wed, 6 Dec 2006 21:07:19 -0800 [thread overview]
Message-ID: <20061206210719.ececc3ec.randy.dunlap@oracle.com> (raw)
In-Reply-To: <14049.1165462977@neuling.org>
On Thu, 07 Dec 2006 14:42:57 +1100 Michael Neuling wrote:
> Add retain_initrd option to control freeing of initrd memory after
> extraction. By default, free memory as previously.
>
> Signed-off-by: Michael Neuling <mikey@neuling.org>
> ---
> Updated based on comments from akpm.
> Added documentation and changed option name to "retain_initrd"
> Tested on POWERPC with CPIOs
>
> Documentation/kernel-parameters.txt | 2 ++
> init/initramfs.c | 18 ++++++++++++++++--
> 2 files changed, 18 insertions(+), 2 deletions(-)
>
> Index: linux-2.6-ozlabs/init/initramfs.c
> ===================================================================
> --- linux-2.6-ozlabs.orig/init/initramfs.c
> +++ linux-2.6-ozlabs/init/initramfs.c
> @@ -487,6 +487,17 @@ static char * __init unpack_to_rootfs(ch
> return message;
> }
>
> +static int do_retain_initrd = 0;
> +
> +static int __init retain_initrd_param(char *str)
> +{
> + if (*str)
> + return 0;
> + do_retain_initrd = 1;
> + return 1;
> +}
> +__setup("retain_initrd", retain_initrd_param);
> +
> extern char __initramfs_start[], __initramfs_end[];
> #ifdef CONFIG_BLK_DEV_INITRD
> #include <linux/initrd.h>
> @@ -494,10 +505,13 @@ extern char __initramfs_start[], __initr
>
> static void __init free_initrd(void)
> {
> -#ifdef CONFIG_KEXEC
> unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
> unsigned long crashk_end = (unsigned long)__va(crashk_res.end);
How does this work when CONFIG_KEXEC=n ??
Tested?
> + if (do_retain_initrd)
> + goto skip;
> +
> +#ifdef CONFIG_KEXEC
> /*
> * If the initrd region is overlapped with crashkernel reserved region,
> * free only memory that is not part of crashkernel region.
> @@ -515,7 +529,7 @@ static void __init free_initrd(void)
> } else
> #endif
> free_initrd_mem(initrd_start, initrd_end);
> -
> +skip:
> initrd_start = 0;
> initrd_end = 0;
> }
> -
---
~Randy
next prev parent reply other threads:[~2006-12-07 5:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-07 3:42 Michael Neuling
2006-12-07 5:07 ` Randy Dunlap [this message]
2006-12-07 5:14 ` Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2006-12-07 0:18 Michael Neuling
2006-12-07 0:25 ` Randy Dunlap
2006-12-07 0:30 ` Andrew Morton
2006-12-07 0:37 ` H. Peter Anvin
2006-12-07 3:36 ` Michael Neuling
2006-12-07 16:47 ` [Fastboot] " Vivek Goyal
2006-12-07 21:40 ` Haren Myneni
2006-12-07 23:32 ` Michael Neuling
2006-12-07 3:56 ` Haren Myneni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061206210719.ececc3ec.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=akpm@osdl.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mikey@neuling.org \
--cc=viro@ftp.linux.org.uk \
--subject='Re: [PATCH] free initrds boot option' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).