[PATCH] OMAP: Fix build failure on MEMBLOCK_REAL_LIMIT

[PATCH] OMAP: Fix build failure on MEMBLOCK_REAL_LIMIT

[Namhyung Kim]

The MEMBLOCK_REAL_LIMIT symbol was removed by the commit e63075a3c937
(memblock: Introduce default allocation limit and use it to replace
explicit ones) so it breaks beagle board build as follows:

  CC      drivers/video/omap2/vram.o
drivers/video/omap2/vram.c: In function 'omap_vram_reserve_sdram_memblock':
drivers/video/omap2/vram.c:573: error: 'MEMBLOCK_REAL_LIMIT' undeclared (first use in this function)
drivers/video/omap2/vram.c:573: error: (Each undeclared identifier is reported only once
drivers/video/omap2/vram.c:573: error: for each function it appears in.)
make[5]: *** [drivers/video/omap2/vram.o] Error 1
make[4]: *** [drivers/video/omap2] Error 2
make[3]: *** [drivers/video] Error 2
make[2]: *** [drivers] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 drivers/video/omap2/vram.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index fed2a72..39b85f7 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -570,7 +570,8 @@ void __init omap_vram_reserve_sdram_memblock(void)
 			return;
 		}
 	} else {
-		paddr = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_REAL_LIMIT);
+		paddr = memblock_alloc_base(size, PAGE_SIZE,
+					    MEMBLOCK_ALLOC_ACCESSIBLE);
 	}
 
 	omap_vram_add_region(paddr, size);
-- 
1.7.0.4

Re: [PATCH] OMAP: Fix build failure on MEMBLOCK_REAL_LIMIT

[Tomi Valkeinen]

On Mon, 2010-11-01 at 17:30 +0100, ext Namhyung Kim wrote:
> The MEMBLOCK_REAL_LIMIT symbol was removed by the commit e63075a3c937
> (memblock: Introduce default allocation limit and use it to replace
> explicit ones) so it breaks beagle board build as follows:
> 
>   CC      drivers/video/omap2/vram.o
> drivers/video/omap2/vram.c: In function 'omap_vram_reserve_sdram_memblock':
> drivers/video/omap2/vram.c:573: error: 'MEMBLOCK_REAL_LIMIT' undeclared (first use in this function)
> drivers/video/omap2/vram.c:573: error: (Each undeclared identifier is reported only once
> drivers/video/omap2/vram.c:573: error: for each function it appears in.)
> make[5]: *** [drivers/video/omap2/vram.o] Error 1
> make[4]: *** [drivers/video/omap2] Error 2
> make[3]: *** [drivers/video] Error 2
> make[2]: *** [drivers] Error 2
> make[1]: *** [sub-make] Error 2
> make: *** [all] Error 2

Thanks, applied to my tree.

 Tomi

Re: [PATCH] OMAP: Fix build failure on MEMBLOCK_REAL_LIMIT

[Felipe Contreras]

On Mon, Nov 1, 2010 at 6:30 PM, Namhyung Kim <namhyung@gmail.com> wrote:
> --- a/drivers/video/omap2/vram.c
> +++ b/drivers/video/omap2/vram.c
> @@ -570,7 +570,8 @@ void __init omap_vram_reserve_sdram_memblock(void)
>                        return;
>                }
>        } else {
> -               paddr = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_REAL_LIMIT);
> +               paddr = memblock_alloc_base(size, PAGE_SIZE,
> +                                           MEMBLOCK_ALLOC_ACCESSIBLE);

This is exactly the same as:
 paddr = memblock_alloc(size, PAGE_SIZE);

Let's use that instead.

-- 
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html