diff options
| author | Mark Fortescue <mark@mtfhpc.demon.co.uk> | 2007-08-14 18:22:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-08-14 18:22:03 -0700 |
| commit | f642b263800e6e57c377d630be6d2a999683b579 (patch) | |
| tree | 860001098521ea6578ddf71a4fa5e6b23be9d032 | |
| parent | 3ac4c949e02f26be1e4378f9acfb07ec87db947b (diff) | |
| download | op-kernel-dev-f642b263800e6e57c377d630be6d2a999683b579.zip op-kernel-dev-f642b263800e6e57c377d630be6d2a999683b579.tar.gz | |
[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>
| -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 a1bef07..c13e6cd 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) #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; + 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) { |
