Mainline OMAP3 breakage (and other OMAP?)

Tony Lindgren tony at atomide.com
Thu Dec 2 16:58:38 EST 2010


* Russell King - ARM Linux <linux at arm.linux.org.uk> [101202 13:04]:
> This has been around since October:
> 
> 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.)
> 
> This requires a trivial one-liner compile fix:
> 
> diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
> index fed2a72..a8973f0 100644
> --- a/drivers/video/omap2/vram.c
> +++ b/drivers/video/omap2/vram.c
> @@ -570,7 +570,7 @@ 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);
>  	}
>  
>  	omap_vram_add_region(paddr, size);
> 
> which restores the old behaviour before the X86 memblock changes went
> in.  Yes, there may be other changes due to the ioremap stuff, but
> that's really no excuse for not fixing the compile error itself.

Great. Adding fbdev and Tomi to Cc.

Acked-by: Tony Lindgren <tony at atomide.com>



More information about the linux-arm-kernel mailing list