From 5c8eb2773efb1b7d1ad40d83866a2cff4298370e Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Wed, 10 Nov 2010 11:45:19 +0200
Subject: [PATCH] --- yaml --- r: 222108 b: refs/heads/master c:
 88abf44d3d8d4fefcbf3d57584d471e38cb51627 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/video/omap2/vram.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c6a4c4f606dc..ab2d78839382 100644
--- 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
index bb5ee0663e65..2fd7e5271be9 100644
--- 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);