From 371bfdb25dd407b82d99d4833b7ed51325a98043 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 26 Sep 2006 23:14:21 -0700 Subject: [PATCH] --- yaml --- r: 36218 b: refs/heads/master c: 715a0ecc29c850d2b2f76e1803d3f22cd5a0ac0d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc64/mm/init.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 654b51314563..6f966f828dc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e531dcc568ca326428158e9574b8560572b8ae28 +refs/heads/master: 715a0ecc29c850d2b2f76e1803d3f22cd5a0ac0d diff --git a/trunk/arch/sparc64/mm/init.c b/trunk/arch/sparc64/mm/init.c index dcba4e6ab570..09cb7fccc03a 100644 --- a/trunk/arch/sparc64/mm/init.c +++ b/trunk/arch/sparc64/mm/init.c @@ -920,8 +920,7 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail, if (sparc_ramdisk_image || sparc_ramdisk_image64) { unsigned long ramdisk_image = sparc_ramdisk_image ? sparc_ramdisk_image : sparc_ramdisk_image64; - if (ramdisk_image >= (unsigned long)_end - 2 * PAGE_SIZE) - ramdisk_image -= KERNBASE; + ramdisk_image -= KERNBASE; initrd_start = ramdisk_image + phys_base; initrd_end = initrd_start + sparc_ramdisk_size; if (initrd_end > end_of_phys_memory) {