diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-08-20 18:52:18 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-21 02:40:01 -0400 |
| commit | efb896300cc9215f60bb4f7f77f93541ab9f1713 (patch) | |
| tree | 08ced8db80551beb819065c96a8f0e7a172f5179 /arch/sparc/mm | |
| parent | 195f7fd0a7e2b3179d52aa8ed6de3637203946c6 (diff) | |
[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>
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index c13e6cd279ac..a1bef07755a9 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) | |||
| 206 | #ifdef CONFIG_BLK_DEV_INITRD | 206 | #ifdef CONFIG_BLK_DEV_INITRD |
| 207 | /* Now have to check initial ramdisk, so that bootmap does not overwrite it */ | 207 | /* Now have to check initial ramdisk, so that bootmap does not overwrite it */ |
| 208 | if (sparc_ramdisk_image) { | 208 | if (sparc_ramdisk_image) { |
| 209 | sparc_ramdisk_image -= KERNBASE; | 209 | if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE) |
| 210 | sparc_ramdisk_image -= KERNBASE; | ||
| 210 | initrd_start = sparc_ramdisk_image + phys_base; | 211 | initrd_start = sparc_ramdisk_image + phys_base; |
| 211 | initrd_end = initrd_start + sparc_ramdisk_size; | 212 | initrd_end = initrd_start + sparc_ramdisk_size; |
| 212 | if (initrd_end > end_of_phys_memory) { | 213 | if (initrd_end > end_of_phys_memory) { |