Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Revert f642b263800e6e57c377d630be6d2a999683b579.
  [SPARC64]: Need to clobber global reg vars in switch_to().

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)
 #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) {