---

yaml --- r: 222108 b: refs/heads/master c: 88abf44 h: refs/heads/master v: v3
git-mirror · Nov 10, 2010 · 5c8eb27 · 5c8eb27
1 parent 95b8eab
commit 5c8eb27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 108409a8a4e325db38f27258da68d7207a0ad433
+refs/heads/master: 88abf44d3d8d4fefcbf3d57584d471e38cb51627
diff --git a/trunk/drivers/video/omap2/vram.c b/trunk/drivers/video/omap2/vram.c
@@ -576,9 +576,12 @@ void __init omap_vram_reserve_sdram_memblock(void)
 			return;
 		}
 	} else {
-		paddr = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_REAL_LIMIT);
+		paddr = memblock_alloc(size, PAGE_SIZE);
 	}
 
+	memblock_free(paddr, size);
+	memblock_remove(paddr, size);
+
 	omap_vram_add_region(paddr, size);
 
 	pr_info("Reserving %u bytes SDRAM for VRAM\n", size);