---

yaml --- r: 366247 b: refs/heads/master c: 26bfc54 h: refs/heads/master i: 366245: 3426722 366243: e8f12cb 366239: f5a3c79 v: v3
git-mirror · Apr 16, 2013 · 82a9137 · 82a9137
1 parent 9075ffa
commit 82a9137
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 587ff8c4eab1587044e69156f997e9d1d3b07709
+refs/heads/master: 26bfc540f6f2dcbd93d0b9ed8f37830419ded7e8
diff --git a/trunk/arch/x86/kernel/aperture_64.c b/trunk/arch/x86/kernel/aperture_64.c
@@ -87,7 +87,7 @@ static u32 __init allocate_aperture(void)
 	 */
 	addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,
 				      aper_size, aper_size);
-	if (!addr || addr + aper_size > GART_MAX_ADDR) {
+	if (!addr) {
 		printk(KERN_ERR
 			"Cannot allocate aperture memory hole (%lx,%uK)\n",
 				addr, aper_size>>10);