From mboxrd@z Thu Jan 1 00:00:00 1970 From: yinghai@kernel.org (Yinghai Lu) Date: Tue, 05 Oct 2010 21:28:10 -0700 Subject: multiple linux-next OMAP3 build errors In-Reply-To: <4CAA58A2.6060707@kernel.org> References: <1286173747.2358.4.camel@tubuntu.research.nokia.com> <1286231422.2463.316.camel@pasglop> <4CAA58A2.6060707@kernel.org> Message-ID: <4CABFADA.9020305@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 10/04/2010 03:43 PM, Yinghai Lu wrote: > On 10/04/2010 03:30 PM, Benjamin Herrenschmidt wrote: >> On Mon, 2010-10-04 at 09:29 +0300, Tomi Valkeinen wrote: >>>> CC drivers/video/omap2/vram.o >>>> drivers/video/omap2/vram.c: In function >>> 'omap_vram_reserve_sdram_memblock': >>>> drivers/video/omap2/vram.c:568: error: implicit declaration of >>>> function 'memblock_region_is_memory' >>> >>> Benjamin, your patch "memblock/arm: Use memblock_region_is_memory() >>> for >>> omap fb" in linux-next seems to be broken. I believe the called >>> function >>> should be memblock_is_region_memory, not memblock_region_is_memory? >> >> I suspect either I didn't push my latest version before it got merged or >> Yinghai didn't pull the right one, since I'm pretty sure I test built >> it, but in any case, you're probably right :-) >> >> I'm not in control of this patch series at the moment however. Ingo and >> Yinghai are. Yinghai, care to fix that up ? I'm currently travelling on >> holidays and won't be able to do much until later next week. > Please check delta patch for core/memblock. Yinghai [PATCH] memblock/arm: Fix typo with memblock_region_is_memory() Fix typo in | commit dbe3039e64b1dd4cf26f782d45b524f85b444ad4 | [PATCH -v2] memblock/arm: Use memblock_region_is_memory() for omap fb should be memblock_is_region_memory(). Reported-by: Tomi Valkeinen Signed-off-by: Yinghai Lu --- arch/arm/plat-omap/fb.c | 2 +- drivers/video/omap2/vram.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6/arch/arm/plat-omap/fb.c =================================================================== --- linux-2.6.orig/arch/arm/plat-omap/fb.c +++ linux-2.6/arch/arm/plat-omap/fb.c @@ -173,7 +173,7 @@ static int check_fbmem_region(int region static int valid_sdram(unsigned long addr, unsigned long size) { - return memblock_region_is_memory(addr, size); + return memblock_is_region_memory(addr, size); } static int reserve_sdram(unsigned long addr, unsigned long size) Index: linux-2.6/drivers/video/omap2/vram.c =================================================================== --- linux-2.6.orig/drivers/video/omap2/vram.c +++ linux-2.6/drivers/video/omap2/vram.c @@ -555,7 +555,7 @@ void __init omap_vram_reserve_sdram_memb if (paddr) { if ((paddr & ~PAGE_MASK) || - !memblock_region_is_memory(paddr, size)) { + !memblock_is_region_memory(paddr, size)) { pr_err("Illegal SDRAM region for VRAM\n"); return; }