From: David S. Miller <davem@sunset.davemloft.net>
Date: Mon, 20 Aug 2007 22:52:18 +0000 (-0700)
Subject: [SPARC32]: Revert f642b263800e6e57c377d630be6d2a999683b579.
X-Git-Tag: v2.6.23-rc4~91^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efb896300cc9215f60bb4f7f77f93541ab9f1713;p=linux-2.6

[SPARC32]: Revert f642b263800e6e57c377d630be6d2a999683b579.

This causes boot failures for some people.
It looks like in fact that some SILO provided
ramdisk images should not be KERNBASE normalized.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c
index c13e6cd279..a1bef07755 100644
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@@ -206,7 +206,8 @@ 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) {
-		sparc_ramdisk_image -= KERNBASE;
+		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;
 		if (initrd_end > end_of_phys_memory) {