OMAP: VRAM: Fix boot-time memory allocation

Use memblock_free() and memblock_remove() to remove the allocated or
reserved VRAM area from normal kernel memory.

This is a slightly modified version of patches from Felipe Contreras and
Namhyung Kim.

Reported-by: Felipe Contreras <felipe.contreras@gmail.com>
Reported-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Tomi Valkeinen 2010-11-10 11:45:19 +02:00 committed by Paul Mundt
parent 108409a8a4
commit 88abf44d3d

View File

@ -576,9 +576,12 @@ void __init omap_vram_reserve_sdram_memblock(void)
return; return;
} }
} else { } 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); omap_vram_add_region(paddr, size);
pr_info("Reserving %u bytes SDRAM for VRAM\n", size); pr_info("Reserving %u bytes SDRAM for VRAM\n", size);