Commit 96eddb81 authored Sep 12, 2018 by Linus Torvalds

Merge tag 'riscv-for-linus-4.19-rc3' of...

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

parents aeb54272 e866d3e8

arch/riscv/kernel/setup.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -85,15 +85,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;