Mainline OMAP3 breakage (and other OMAP?)

[Tony Lindgren]

* Tomi Valkeinen <tomi.valkeinen at nokia.com> [101214 04:23]:
> >
> > So please, 2MB, or if you object, at the _very_ _least_ 1MB.  But
> > definitely not PAGE_SIZE.

Acked-by: Tony Lindgren <tony at atomide.com>
 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen at nokia.com>
> ---
>  drivers/video/omap2/vram.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
> index 2fd7e52..9441e2e 100644
> --- a/drivers/video/omap2/vram.c
> +++ b/drivers/video/omap2/vram.c
> @@ -551,7 +551,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
>  	if (!size)
>  		return;
>  
> -	size = PAGE_ALIGN(size);
> +	size = ALIGN(size, SZ_2M);
>  
>  	if (paddr) {
>  		if (paddr & ~PAGE_MASK) {
> @@ -576,7 +576,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
>  			return;
>  		}
>  	} else {
> -		paddr = memblock_alloc(size, PAGE_SIZE);
> +		paddr = memblock_alloc(size, SZ_2M);
>  	}
>  
>  	memblock_free(paddr, size);
> -- 
> 1.7.1
> 
> 
>