From: "Robert P. J. Day" <rpjday@mindspring.com>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Subject: [PATCH] ARM: Drop support for redundant "keepinitrd" boot-time param.
Date: Wed, 19 Sep 2007 12:06:44 -0400 (EDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0709191203460.30041@localhost.localdomain> (raw)
Given the equivalent "retain_initrd" boot-time paramater, "keepinitrd"
appears to be entirely superfluous.
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
---
since this appears to be exactly the situation as with AVR32, it's
an equivalent patch. there are no other situations like this in the
tree, but the decision is clearly up to the ARM folks.
not compile tested.
Documentation/kernel-parameters.txt | 2 --
arch/arm/configs/jornada720_defconfig | 2 +-
arch/arm/mm/init.c | 12 +-----------
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 586b6f8..ccd3b1d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -847,8 +847,6 @@ and is between 256 and 4096 characters. It is defined in the file
that the amount of memory usable for all allocations
is not too small.
- keepinitrd [HW,ARM]
-
kstack=N [X86-32,X86-64] Print N words from the kernel stack
in oops dumps.
diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig
index 0c55628..e6c45a0 100644
--- a/arch/arm/configs/jornada720_defconfig
+++ b/arch/arm/configs/jornada720_defconfig
@@ -151,7 +151,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="keepinitrd mem=32M"
+CONFIG_CMDLINE="retain_initrd mem=32M"
# CONFIG_XIP_KERNEL is not set
#
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index c0ad7c0..440caa4 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -487,19 +487,9 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD
-static int keep_initrd;
-
void free_initrd_mem(unsigned long start, unsigned long end)
{
- if (!keep_initrd)
- free_area(start, end, "initrd");
-}
-
-static int __init keepinitrd_setup(char *__unused)
-{
- keep_initrd = 1;
- return 1;
+ free_area(start, end, "initrd");
}
-__setup("keepinitrd", keepinitrd_setup);
#endif
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
http://crashcourse.ca
========================================================================
next reply other threads:[~2007-09-19 16:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-19 16:06 Robert P. J. Day [this message]
2007-09-20 7:22 ` Russell King
2007-09-20 8:15 ` Michael Neuling
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=Pine.LNX.4.64.0709191203460.30041@localhost.localdomain \
--to=rpjday@mindspring.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®