multiple linux-next OMAP3 build errors

multiple linux-next OMAP3 build errors

[Grazvydas Ignotas]

hi,

I've been building linux-next for a while now and keep getting these
build errors, just posting them here in case not all are known. Not
familiar enough with that code to send patches unfortunately.

  AS      arch/arm/mm/proc-v7.o
arch/arm/mm/proc-v7.S: Assembler messages:
arch/arm/mm/proc-v7.S:363: Error: undefined symbol `PMD_FLAGS' in operation

  CC      drivers/usb/musb/musb_gadget.o
drivers/usb/musb/musb_gadget.c:1789: error:
'usb_gadget_register_driver' undeclared here (not in a function)
drivers/usb/musb/musb_gadget.c:1789: warning: type defaults to 'int'
in declaration of 'usb_gadget_register_driver'

  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'

  LD      .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `serial_write_reg':
/home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/serial.c:168:
undefined reference to `enable_off_mode'
arch/arm/mach-omap2/built-in.o: In function `omap_uart_prepare_idle':
/home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/serial.c:404:
undefined reference to `enable_off_mode'
arch/arm/mach-omap2/built-in.o: In function `omap3_can_sleep':
/home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/pm34xx.c:484:
undefined reference to `sleep_while_idle'

I'm using this customized config:
http://notaz.gp2x.de/misc/pnd/config_next_101001

multiple linux-next OMAP3 build errors

[Grazvydas Ignotas]

hi,

I've been building linux-next for a while now and keep getting these
build errors, just posting them here in case not all are known. Not
familiar enough with that code to send patches unfortunately.

  AS      arch/arm/mm/proc-v7.o
arch/arm/mm/proc-v7.S: Assembler messages:
arch/arm/mm/proc-v7.S:363: Error: undefined symbol `PMD_FLAGS' in operation

  CC      drivers/usb/musb/musb_gadget.o
drivers/usb/musb/musb_gadget.c:1789: error:
'usb_gadget_register_driver' undeclared here (not in a function)
drivers/usb/musb/musb_gadget.c:1789: warning: type defaults to 'int'
in declaration of 'usb_gadget_register_driver'

  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'

  LD      .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `serial_write_reg':
/home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/serial.c:168:
undefined reference to `enable_off_mode'
arch/arm/mach-omap2/built-in.o: In function `omap_uart_prepare_idle':
/home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/serial.c:404:
undefined reference to `enable_off_mode'
arch/arm/mach-omap2/built-in.o: In function `omap3_can_sleep':
/home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/pm34xx.c:484:
undefined reference to `sleep_while_idle'

I'm using this customized config:
http://notaz.gp2x.de/misc/pnd/config_next_101001

RE: multiple linux-next OMAP3 build errors

[Anand Gadiyar]

Grazvydas Ignotas wrote:
>
> hi,
>
> I've been building linux-next for a while now and keep getting these
> build errors, just posting them here in case not all are known. Not
> familiar enough with that code to send patches unfortunately.
>
>   AS      arch/arm/mm/proc-v7.o
> arch/arm/mm/proc-v7.S: Assembler messages:
> arch/arm/mm/proc-v7.S:363: Error: undefined symbol `PMD_FLAGS' in
operation
>
>   CC      drivers/usb/musb/musb_gadget.o
> drivers/usb/musb/musb_gadget.c:1789: error: 'usb_gadget_register_driver'
undeclared here (not in a function)
> drivers/usb/musb/musb_gadget.c:1789: warning: type defaults to 'int' in
declaration of 'usb_gadget_register_driver'
>
>   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'
>
>   LD      .tmp_vmlinux1
> arch/arm/mach-omap2/built-in.o: In function `serial_write_reg':
> /home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/serial.c:168:
undefined reference to `enable_off_mode'
> arch/arm/mach-omap2/built-in.o: In function `omap_uart_prepare_idle':
> /home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/serial.c:404:
undefined reference to `enable_off_mode'
> arch/arm/mach-omap2/built-in.o: In function `omap3_can_sleep':
> /home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/pm34xx.c:484:
undefined reference to `sleep_while_idle'
>
> I'm using this customized config:
> http://notaz.gp2x.de/misc/pnd/config_next_101001


Thanks for reporting. I'll take a stab at fixing some of these.

We've been playing with autobuilding linux-omap and linux-omap-pm,
but didn't think of looking at linux-next. We'll start now.

- Anand

multiple linux-next OMAP3 build errors

[Anand Gadiyar]

Grazvydas Ignotas wrote:
>
> hi,
>
> I've been building linux-next for a while now and keep getting these
> build errors, just posting them here in case not all are known. Not
> familiar enough with that code to send patches unfortunately.
>
>   AS      arch/arm/mm/proc-v7.o
> arch/arm/mm/proc-v7.S: Assembler messages:
> arch/arm/mm/proc-v7.S:363: Error: undefined symbol `PMD_FLAGS' in
operation
>
>   CC      drivers/usb/musb/musb_gadget.o
> drivers/usb/musb/musb_gadget.c:1789: error: 'usb_gadget_register_driver'
undeclared here (not in a function)
> drivers/usb/musb/musb_gadget.c:1789: warning: type defaults to 'int' in
declaration of 'usb_gadget_register_driver'
>
>   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'
>
>   LD      .tmp_vmlinux1
> arch/arm/mach-omap2/built-in.o: In function `serial_write_reg':
> /home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/serial.c:168:
undefined reference to `enable_off_mode'
> arch/arm/mach-omap2/built-in.o: In function `omap_uart_prepare_idle':
> /home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/serial.c:404:
undefined reference to `enable_off_mode'
> arch/arm/mach-omap2/built-in.o: In function `omap3_can_sleep':
> /home/notaz/dev/pnd/kernel/linux-next/arch/arm/mach-omap2/pm34xx.c:484:
undefined reference to `sleep_while_idle'
>
> I'm using this customized config:
> http://notaz.gp2x.de/misc/pnd/config_next_101001


Thanks for reporting. I'll take a stab at fixing some of these.

We've been playing with autobuilding linux-omap and linux-omap-pm,
but didn't think of looking at linux-next. We'll start now.

- Anand

Re: multiple linux-next OMAP3 build errors

[Tony Lindgren]

* Grazvydas Ignotas <notasas@gmail.com> [101001 08:49]:
> hi,
> 
> I've been building linux-next for a while now and keep getting these
> build errors, just posting them here in case not all are known. Not
> familiar enough with that code to send patches unfortunately.
> 
>   AS      arch/arm/mm/proc-v7.o
> arch/arm/mm/proc-v7.S: Assembler messages:
> arch/arm/mm/proc-v7.S:363: Error: undefined symbol `PMD_FLAGS' in operation

This I've already fixed in omap-testing branch. Should get merged into
for-next soonish.

Regards,

Tony 

multiple linux-next OMAP3 build errors

[Tony Lindgren]

* Grazvydas Ignotas <notasas@gmail.com> [101001 08:49]:
> hi,
> 
> I've been building linux-next for a while now and keep getting these
> build errors, just posting them here in case not all are known. Not
> familiar enough with that code to send patches unfortunately.
> 
>   AS      arch/arm/mm/proc-v7.o
> arch/arm/mm/proc-v7.S: Assembler messages:
> arch/arm/mm/proc-v7.S:363: Error: undefined symbol `PMD_FLAGS' in operation

This I've already fixed in omap-testing branch. Should get merged into
for-next soonish.

Regards,

Tony 

Re: multiple linux-next OMAP3 build errors

[Tomi Valkeinen]

Hi,

On Fri, 2010-10-01 at 17:57 +0200, ext Grazvydas Ignotas wrote:
> hi,
> 
> I've been building linux-next for a while now and keep getting these
> build errors, just posting them here in case not all are known. Not
> familiar enough with that code to send patches unfortunately.

>   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?

 Tomi

multiple linux-next OMAP3 build errors

[Tomi Valkeinen]

Hi,

On Fri, 2010-10-01 at 17:57 +0200, ext Grazvydas Ignotas wrote:
> hi,
> 
> I've been building linux-next for a while now and keep getting these
> build errors, just posting them here in case not all are known. Not
> familiar enough with that code to send patches unfortunately.

>   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?

 Tomi

Re: multiple linux-next OMAP3 build errors

[Gadiyar, Anand]

On Mon, Oct 4, 2010 at 11:59 AM, Tomi Valkeinen
<tomi.valkeinen@nokia.com> wrote:
> Hi,
>
> On Fri, 2010-10-01 at 17:57 +0200, ext Grazvydas Ignotas wrote:
>> hi,
>>
>> I've been building linux-next for a while now and keep getting these
>> build errors, just posting them here in case not all are known. Not
>> familiar enough with that code to send patches unfortunately.
>
>>   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've posted this patch [1] for this. Could one of you please pick up,
or fold into
the original patch if it hasn't yet reached mainline?

- Anand

[1] https://patchwork.kernel.org/patch/224902/
--
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

multiple linux-next OMAP3 build errors

[Gadiyar, Anand]

On Mon, Oct 4, 2010 at 11:59 AM, Tomi Valkeinen
<tomi.valkeinen@nokia.com> wrote:
> Hi,
>
> On Fri, 2010-10-01 at 17:57 +0200, ext Grazvydas Ignotas wrote:
>> hi,
>>
>> I've been building linux-next for a while now and keep getting these
>> build errors, just posting them here in case not all are known. Not
>> familiar enough with that code to send patches unfortunately.
>
>> ? 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've posted this patch [1] for this. Could one of you please pick up,
or fold into
the original patch if it hasn't yet reached mainline?

- Anand

[1] https://patchwork.kernel.org/patch/224902/

Re: multiple linux-next OMAP3 build errors

[Benjamin Herrenschmidt]

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.

Cheers,
Ben.

multiple linux-next OMAP3 build errors

[Benjamin Herrenschmidt]

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.

Cheers,
Ben.

Re: multiple linux-next OMAP3 build errors

[Yinghai Lu]

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.

Peter or Ingo,

Please replace

commit dbe3039e64b1dd4cf26f782d45b524f85b444ad4

in -tip core/memblock

with following patch, that fixes the typo.

Thanks

Yinghai Lu

[PATCH -v2] memblock/arm: Use memblock_is_region_memory() for omap fb
    
Instead of the deprecated memblock_find()
    
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 05bf228..441af2b 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -173,11 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg,
 
 static int valid_sdram(unsigned long addr, unsigned long size)
 {
-	struct memblock_region res;
-
-	res.base = addr;
-	res.size = size;
-	return !memblock_find(&res) && res.base == addr && res.size == size;
+	return memblock_is_region_memory(addr, size);
 }
 
 static int reserve_sdram(unsigned long addr, unsigned long size)
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 0f2532b..34514a8 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)
 	size = PAGE_ALIGN(size);
 
 	if (paddr) {
-		struct memblock_region res;
-
-		res.base = paddr;
-		res.size = size;
-		if ((paddr & ~PAGE_MASK) || memblock_find(&res) ||
-		    res.base != paddr || res.size != size) {
+		if ((paddr & ~PAGE_MASK) ||
+		    !memblock_is_region_memory(paddr, size)) {
 			pr_err("Illegal SDRAM region for VRAM\n");
 			return;
 		}

multiple linux-next OMAP3 build errors

[Yinghai Lu]

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.

Peter or Ingo,

Please replace

commit dbe3039e64b1dd4cf26f782d45b524f85b444ad4

in -tip core/memblock

with following patch, that fixes the typo.

Thanks

Yinghai Lu

[PATCH -v2] memblock/arm: Use memblock_is_region_memory() for omap fb
    
Instead of the deprecated memblock_find()
    
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 05bf228..441af2b 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -173,11 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg,
 
 static int valid_sdram(unsigned long addr, unsigned long size)
 {
-	struct memblock_region res;
-
-	res.base = addr;
-	res.size = size;
-	return !memblock_find(&res) && res.base == addr && res.size == size;
+	return memblock_is_region_memory(addr, size);
 }
 
 static int reserve_sdram(unsigned long addr, unsigned long size)
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 0f2532b..34514a8 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)
 	size = PAGE_ALIGN(size);
 
 	if (paddr) {
-		struct memblock_region res;
-
-		res.base = paddr;
-		res.size = size;
-		if ((paddr & ~PAGE_MASK) || memblock_find(&res) ||
-		    res.base != paddr || res.size != size) {
+		if ((paddr & ~PAGE_MASK) ||
+		    !memblock_is_region_memory(paddr, size)) {
 			pr_err("Illegal SDRAM region for VRAM\n");
 			return;
 		}

Re: multiple linux-next OMAP3 build errors

[Yinghai Lu]

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 <tomi.valkeinen@nokia.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 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;
 		}

multiple linux-next OMAP3 build errors

[Yinghai Lu]

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 <tomi.valkeinen@nokia.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 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;
 		}

[tip:core/memblock] memblock/arm: Fix memblock_region_is_memory() typo

[tip-bot for Yinghai Lu]

Commit-ID:  5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a
Gitweb:     http://git.kernel.org/tip/5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a
Author:     Yinghai Lu <yinghai@kernel.org>
AuthorDate: Tue, 5 Oct 2010 21:28:10 -0700
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 8 Oct 2010 09:14:36 +0200

memblock/arm: Fix memblock_region_is_memory() typo

Fix typo in commit dbe3039 ("memblock/arm: Use memblock_region_is_memory()
for omap fb") - it should be memblock_is_region_memory().

Reported-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: ext Grazvydas Ignotas <notasas@gmail.com>
LKML-Reference: <4CABFADA.9020305@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/arm/plat-omap/fb.c    |    2 +-
 drivers/video/omap2/vram.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 441af2b..7193481 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -173,7 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg,
 
 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)
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 34514a8..fed2a72 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -555,7 +555,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
 
 	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;
 		}