diff options
author | Mark Fortescue <mark@mtfhpc.demon.co.uk> | 2007-08-14 21:22:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-08-14 21:22:03 -0400 |
commit | f642b263800e6e57c377d630be6d2a999683b579 (patch) | |
tree | 860001098521ea6578ddf71a4fa5e6b23be9d032 /arch/sparc/mm | |
parent | 3ac4c949e02f26be1e4378f9acfb07ec87db947b (diff) |
[SPARC32]: Fix bogus ramdisk image location check.
This mirrors sparc64 commit 715a0ecc29c850d2b2f76e1803d3f22cd5a0ac0d
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>
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r-- | arch/sparc/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index a1bef07755a9..c13e6cd279ac 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c | |||
@@ -206,8 +206,7 @@ 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 | if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE) | 209 | sparc_ramdisk_image -= KERNBASE; |
210 | sparc_ramdisk_image -= KERNBASE; | ||
211 | initrd_start = sparc_ramdisk_image + phys_base; | 210 | initrd_start = sparc_ramdisk_image + phys_base; |
212 | initrd_end = initrd_start + sparc_ramdisk_size; | 211 | initrd_end = initrd_start + sparc_ramdisk_size; |
213 | if (initrd_end > end_of_phys_memory) { | 212 | if (initrd_end > end_of_phys_memory) { |