aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 00:09:23 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 00:38:56 -0400
commitdbe3039e64b1dd4cf26f782d45b524f85b444ad4 (patch)
tree4c23d00bf2a357691c986276988e571cb5968085 /drivers/video
parent5e6f6aa1c243fafeb2648cf4ebd5abd99ab2531b (diff)
memblock/arm: Use memblock_region_is_memory() for omap fb
Instead of the deprecated memblock_find() Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/vram.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 0f2532bf0f04..34514a899d13 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)
554 size = PAGE_ALIGN(size); 554 size = PAGE_ALIGN(size);
555 555
556 if (paddr) { 556 if (paddr) {
557 struct memblock_region res; 557 if ((paddr & ~PAGE_MASK) ||
558 558 !memblock_region_is_memory(paddr, size)) {
559 res.base = paddr;
560 res.size = size;
561 if ((paddr & ~PAGE_MASK) || memblock_find(&res) ||
562 res.base != paddr || res.size != size) {
563 pr_err("Illegal SDRAM region for VRAM\n"); 559 pr_err("Illegal SDRAM region for VRAM\n");
564 return; 560 return;
565 } 561 }