forked from Minki/linux
[SPARC32]: Fix bogus ramdisk image location check.
This mirrors sparc64 commit 715a0ecc29
sparc_ramdisk_image should always be decremented by KERNBASE.
Signed-off-by: Mark Fortescue <mark@mtfhpc.demon.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3ac4c949e0
commit
f642b26380
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user