Skip to content

Commit 96eddb8

Browse files
committed
Merge tag 'riscv-for-linus-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
Pull RISC-V fix from Palmer Dabbelt: "This contains what I hope to be the last RISC-V patch for 4.19. It fixes a bug in our initramfs support by removing some broken and obselete code" * tag 'riscv-for-linus-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux: riscv: Do not overwrite initrd_start and initrd_end
2 parents aeb5427 + e866d3e commit 96eddb8

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

arch/riscv/kernel/setup.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,8 @@ atomic_t hart_lottery;
8585
#ifdef CONFIG_BLK_DEV_INITRD
8686
static void __init setup_initrd(void)
8787
{
88-
extern char __initramfs_start[];
89-
extern unsigned long __initramfs_size;
9088
unsigned long size;
9189

92-
if (__initramfs_size > 0) {
93-
initrd_start = (unsigned long)(&__initramfs_start);
94-
initrd_end = initrd_start + __initramfs_size;
95-
}
96-
9790
if (initrd_start >= initrd_end) {
9891
printk(KERN_INFO "initrd not found or empty");
9992
goto disable;

0 commit comments

Comments
 (0)