Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f642b263 authored by Mark Fortescue's avatar Mark Fortescue Committed by David S. Miller
Browse files

[SPARC32]: Fix bogus ramdisk image location check. 



This mirrors sparc64 commit 715a0ecc

sparc_ramdisk_image should always be decremented by KERNBASE.

Signed-off-by: default avatarMark Fortescue <mark@mtfhpc.demon.co.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ac4c949

arch/sparc/mm/init.c

+1 −2
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) 
#ifdef CONFIG_BLK_DEV_INITRD

	/* Now have to check initial ramdisk, so that bootmap does not overwrite it */

	if (sparc_ramdisk_image) {

		if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)

		sparc_ramdisk_image -= KERNBASE;

		initrd_start = sparc_ramdisk_image + phys_base;

		initrd_end = initrd_start + sparc_ramdisk_size;