[PATCH 06/43] memblock/arm: Use memblock_region_is_memory() for omap fb
in [Kernel]
|
Prev: [PATCH 17/43] memblock: Expose MEMBLOCK_ALLOC_ANYWHERE
Next: [PATCH 18/43] memblock: Introduce default allocation limit and use it to replace explicit ones
From: Benjamin Herrenschmidt on 6 Aug 2010 01:30 Instead of the deprecated memblock_find() Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> --- arch/arm/plat-omap/fb.c | 6 +----- drivers/video/omap2/vram.c | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index 05bf228..441af2b 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -173,11 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg, static int valid_sdram(unsigned long addr, unsigned long size) { - struct memblock_region res; - - res.base = addr; - res.size = size; - return !memblock_find(&res) && res.base == addr && res.size == size; + return memblock_region_is_memory(addr, size); } static int reserve_sdram(unsigned long addr, unsigned long size) diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c index 0f2532b..34514a8 100644 --- a/drivers/video/omap2/vram.c +++ b/drivers/video/omap2/vram.c @@ -554,12 +554,8 @@ void __init omap_vram_reserve_sdram_memblock(void) size = PAGE_ALIGN(size); if (paddr) { - struct memblock_region res; - - res.base = paddr; - res.size = size; - if ((paddr & ~PAGE_MASK) || memblock_find(&res) || - res.base != paddr || res.size != size) { + if ((paddr & ~PAGE_MASK) || + !memblock_region_is_memory(paddr, size)) { pr_err("Illegal SDRAM region for VRAM\n"); return; } -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |