The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: eacb0c101a0bdf14de77cc9d107493e2d8d6389c
Gitweb: https://git.kernel.org/tip/eacb0c101a0bdf14de77cc9d107493e2d8d6389c
Author: Tom Rini <trini@xxxxxxxxxxxx>
AuthorDate: Fri, 19 Jun 2020 10:30:56 -04:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Fri, 19 Jun 2020 19:23:54 +02:00
initrd: Remove erroneous comment
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.
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.
[ bp: Move the context clarification up into the commit message proper. ]
Fixes: 694cfd87b0c8 ("x86/setup: Add an initrdmem= option to specify initrd physical address")
Signed-off-by: Tom Rini <trini@xxxxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20200619143056.24538-1-trini@xxxxxxxxxxxx
---
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 d72beda..53314d7 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);
|