From 3ca4b94771941dca7da64f6f28018ca46fd7efe2 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 20 Aug 2007 15:52:18 -0700 Subject: [PATCH] --- yaml --- r: 64212 b: refs/heads/master c: efb896300cc9215f60bb4f7f77f93541ab9f1713 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/mm/init.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cb47f73828c9..e390d8287855 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 195f7fd0a7e2b3179d52aa8ed6de3637203946c6 +refs/heads/master: efb896300cc9215f60bb4f7f77f93541ab9f1713 diff --git a/trunk/arch/sparc/mm/init.c b/trunk/arch/sparc/mm/init.c index c13e6cd279ac..a1bef07755a9 100644 --- a/trunk/arch/sparc/mm/init.c +++ b/trunk/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) {