]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
riscv: Do not overwrite initrd_start and initrd_end
authorGuenter Roeck <linux@roeck-us.net>
Wed, 29 Aug 2018 00:33:46 +0000 (17:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Oct 2018 06:56:00 +0000 (08:56 +0200)
commit027f315487ef57a4651b53fb4b3b4970e847a926
tree75dbf4016436d905b227fa41fb8401affe7e9d7b
parent59db47dd566b6f31a8d1202a52b3c80297666950
riscv: Do not overwrite initrd_start and initrd_end

[ Upstream commit e866d3e84eb7c9588afb77604d417e8cc49fe216 ]

setup_initrd() overwrites initrd_start and initrd_end if __initramfs_size
is larger than 0, which is always true even if there is no embedded
initramfs. This prevents booting qemu with "-initrd" parameter.
Overwriting initrd_start and initrd_end is not necessary since
__initramfs_start and __initramfs_size are used directly in
populate_rootfs() to load the built-in initramfs, so just drop
that code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/riscv/kernel/setup.c