linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] omap: tidspbridge: fix build failure on MEMBLOCK_REAL_LIMIT
@ 2010-11-02 13:31 Anand Gadiyar
  2010-11-02 14:05 ` Felipe Contreras
  0 siblings, 1 reply; 3+ messages in thread
From: Anand Gadiyar @ 2010-11-02 13:31 UTC (permalink / raw)
  To: linux-arm-kernel

MEMBLOCK_REAL_LIMIT symbol was removed by the commit e63075a3c937
(memblock: Introduce default allocation limit and use it to replace
explicit ones). This breaks build as below when CONFIG_TIDSPBRIDGE
is selected. Fix this.

  CC      arch/arm/plat-omap/devices.o
arch/arm/plat-omap/devices.c: In function 'omap_dsp_reserve_sdram_memblock':
arch/arm/plat-omap/devices.c:287: error: 'MEMBLOCK_REAL_LIMIT' undeclared (first use in this function)
arch/arm/plat-omap/devices.c:287: error: (Each undeclared identifier is reported only once
arch/arm/plat-omap/devices.c:287: error: for each function it appears in.)
make[1]: *** [arch/arm/plat-omap/devices.o] Error 1
make: *** [arch/arm/plat-omap] Error 2

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Tony Lindgren <tony@atomide.com>
---
Based on another similar patch [1] for vram.c. I've scrubbed the rest
of the tree for MEMBLOCK_REAL_LIMIT. Only other occurrence is in
a comment in arch/powerpc/kernel/setup_32.c [2]. Not sure what this
should be changed to.

[1] http://marc.info/?l=linux-omap&m=128862903431257&w=2
[2] http://lxr.free-electrons.com/source/arch/powerpc/kernel/setup_32.c#L249

 arch/arm/plat-omap/devices.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/arm/plat-omap/devices.c
===================================================================
--- linux-2.6.orig/arch/arm/plat-omap/devices.c
+++ linux-2.6/arch/arm/plat-omap/devices.c
@@ -284,7 +284,7 @@ void __init omap_dsp_reserve_sdram_membl
 	if (!size)
 		return;
 
-	paddr = __memblock_alloc_base(size, SZ_1M, MEMBLOCK_REAL_LIMIT);
+	paddr = __memblock_alloc_base(size, SZ_1M, MEMBLOCK_ALLOC_ACCESSIBLE);
 	if (!paddr) {
 		pr_err("%s: failed to reserve %x bytes\n",
 				__func__, size);

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] omap: tidspbridge: fix build failure on MEMBLOCK_REAL_LIMIT
  2010-11-02 13:31 [PATCH] omap: tidspbridge: fix build failure on MEMBLOCK_REAL_LIMIT Anand Gadiyar
@ 2010-11-02 14:05 ` Felipe Contreras
  2010-11-02 14:10   ` Gadiyar, Anand
  0 siblings, 1 reply; 3+ messages in thread
From: Felipe Contreras @ 2010-11-02 14:05 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Nov 2, 2010 at 3:31 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> MEMBLOCK_REAL_LIMIT symbol was removed by the commit e63075a3c937
> (memblock: Introduce default allocation limit and use it to replace
> explicit ones). This breaks build as below when CONFIG_TIDSPBRIDGE
> is selected. Fix this.

I would rather apply this:
http://article.gmane.org/gmane.linux.ports.arm.omap/45076

-- 
Felipe Contreras

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] omap: tidspbridge: fix build failure on MEMBLOCK_REAL_LIMIT
  2010-11-02 14:05 ` Felipe Contreras
@ 2010-11-02 14:10   ` Gadiyar, Anand
  0 siblings, 0 replies; 3+ messages in thread
From: Gadiyar, Anand @ 2010-11-02 14:10 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Nov 2, 2010 at 10:05 AM, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> On Tue, Nov 2, 2010 at 3:31 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
>> MEMBLOCK_REAL_LIMIT symbol was removed by the commit e63075a3c937
>> (memblock: Introduce default allocation limit and use it to replace
>> explicit ones). This breaks build as below when CONFIG_TIDSPBRIDGE
>> is selected. Fix this.
>
> I would rather apply this:
> http://article.gmane.org/gmane.linux.ports.arm.omap/45076
>

Okay, I hadn't seen that one. Thanks!

- Anand

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-11-02 14:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-02 13:31 [PATCH] omap: tidspbridge: fix build failure on MEMBLOCK_REAL_LIMIT Anand Gadiyar
2010-11-02 14:05 ` Felipe Contreras
2010-11-02 14:10   ` Gadiyar, Anand

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).