---

yaml --- r: 64080 b: refs/heads/master c: f642b26 h: refs/heads/master v: v3
git-mirror · Aug 15, 2007 · 3c9b98d · 3c9b98d
1 parent bb9425e
commit 3c9b98d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ac4c949e02f26be1e4378f9acfb07ec87db947b
+refs/heads/master: f642b263800e6e57c377d630be6d2a999683b579
diff --git a/trunk/arch/sparc/mm/init.c b/trunk/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) {