Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Tom Rini <trini@konsulko.com>
To:     linux-kernel@vger.kernel.org
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Borislav Petkov <bp@suse.de>,
        Dominik Brodowski <linux@dominikbrodowski.net>,
        "H . Peter Anvin" <hpa@zytor.com>,
        "Ronald G . Minnich" <rminnich@gmail.com>
Subject: [PATCH] initrd: Remove erroneous comment
Date:   Fri, 19 Jun 2020 10:30:56 -0400
Message-Id: <20200619143056.24538-1-trini@konsulko.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Most architectures have been passing the location of an initrd via the
initrd= option since their inception.  Remove the comment as it's both
wrong and unrelated to the commit that introduced it.

Fixes: 694cfd87b0c8 ("x86/setup: Add an initrdmem= option to specify initrd physical address")
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: H. Peter Anvin (Intel) <hpa@zytor.com>
Cc: Ronald G. Minnich <rminnich@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
For a bit more context, I assume there's been some confusion between
"initrd" being a keyword in things like extlinux.conf and also that for
quite a long time now initrd information is passed via device tree and
not the command line on relevant architectures.  But it's still true
that it's been a valid command line option to the kernel since the 90s.
It's just the case that in 2018 the code was consolidated from under
arch/ and in to this file.
---
 init/do_mounts_initrd.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index d72beda824aa..53314d7da4be 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -45,11 +45,6 @@ static int __init early_initrdmem(char *p)
 }
 early_param("initrdmem", early_initrdmem);
 
-/*
- * This is here as the initrd keyword has been in use since 11/2018
- * on ARM, PowerPC, and MIPS.
- * It should not be; it is reserved for bootloaders.
- */
 static int __init early_initrd(char *p)
 {
 	return early_initrdmem(p);
-- 
2.17.1