lkml.org 
[lkml]   [2018]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 21/65] riscv: Do not overwrite initrd_start and initrd_end
    Date
    From: Guenter Roeck <linux@roeck-us.net>

    [ 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>
    ---
    arch/riscv/kernel/setup.c | 7 -------
    1 file changed, 7 deletions(-)

    diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
    index f0d2070866d4..0efa5b29d0a3 100644
    --- a/arch/riscv/kernel/setup.c
    +++ b/arch/riscv/kernel/setup.c
    @@ -64,15 +64,8 @@ atomic_t hart_lottery;
    #ifdef CONFIG_BLK_DEV_INITRD
    static void __init setup_initrd(void)
    {
    - extern char __initramfs_start[];
    - extern unsigned long __initramfs_size;
    unsigned long size;

    - if (__initramfs_size > 0) {
    - initrd_start = (unsigned long)(&__initramfs_start);
    - initrd_end = initrd_start + __initramfs_size;
    - }
    -
    if (initrd_start >= initrd_end) {
    printk(KERN_INFO "initrd not found or empty");
    goto disable;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-01 02:53    [W:3.440 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site