linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* Re: 2.6.24-mm1: ppc32: too few arguments to function 'reserve_bootmem'
       [not found] <20080203171634.58ab668b.akpm@linux-foundation.org>
@ 2008-02-04 20:29 ` Mariusz Kozlowski
  2008-02-04 22:40   ` Andrew Morton
  0 siblings, 1 reply; 4+ messages in thread
From: Mariusz Kozlowski @ 2008-02-04 20:29 UTC (permalink / raw)
  To: Andrew Morton, Bernhard Walle; +Cc: linuxppc-dev, Paul Mackerras, linux-kernel

Hello,

	This is from ppc32:

  CC      arch/powerpc/mm/mem.o
arch/powerpc/mm/mem.c: In function 'do_init_bootmem':
arch/powerpc/mm/mem.c:256: error: too few arguments to function 'reserve_bootmem'
arch/powerpc/mm/mem.c:261: error: too few arguments to function 'reserve_bootmem'

Leftover from introduce-flags-for-reserve_bootmem.patch?

Regards,

	Mariusz

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

* Re: 2.6.24-mm1: ppc32: too few arguments to function 'reserve_bootmem'
  2008-02-04 20:29 ` 2.6.24-mm1: ppc32: too few arguments to function 'reserve_bootmem' Mariusz Kozlowski
@ 2008-02-04 22:40   ` Andrew Morton
  2008-02-05 13:00     ` Sergei Shtylyov
  2008-02-05 13:25     ` Bernhard Walle
  0 siblings, 2 replies; 4+ messages in thread
From: Andrew Morton @ 2008-02-04 22:40 UTC (permalink / raw)
  To: Mariusz Kozlowski; +Cc: linuxppc-dev, bwalle, paulus, linux-kernel

On Mon, 4 Feb 2008 21:29:02 +0100
Mariusz Kozlowski <m.kozlowski@tuxland.pl> wrote:

> Hello,
> 
> 	This is from ppc32:
> 
>   CC      arch/powerpc/mm/mem.o
> arch/powerpc/mm/mem.c: In function 'do_init_bootmem':
> arch/powerpc/mm/mem.c:256: error: too few arguments to function 'reserve_bootmem'
> arch/powerpc/mm/mem.c:261: error: too few arguments to function 'reserve_bootmem'
> 
> Leftover from introduce-flags-for-reserve_bootmem.patch?
> 

Yes, I've had to fix that patch many times.

--- a/arch/powerpc/mm/mem.c~introduce-flags-for-reserve_bootmem-powerpc-fix
+++ a/arch/powerpc/mm/mem.c
@@ -253,12 +253,13 @@ void __init do_init_bootmem(void)
 				     lmb_size_bytes(&lmb.reserved, i) - 1;
 		if (addr < total_lowmem)
 			reserve_bootmem(lmb.reserved.region[i].base,
-					lmb_size_bytes(&lmb.reserved, i));
+					lmb_size_bytes(&lmb.reserved, i),
+					BOOTMEM_DEFAULT);
 		else if (lmb.reserved.region[i].base < total_lowmem) {
 			unsigned long adjusted_size = total_lowmem -
 				      lmb.reserved.region[i].base;
 			reserve_bootmem(lmb.reserved.region[i].base,
-					adjusted_size);
+					adjusted_size, BOOTMEM_DWEFAULT);
 		}
 	}
 #else
_

We did this wrong.  We should have introduced a new reserve_bootmem_foo()
and migrated over to that in stages.  Once all callers are migrated, remove
the old interface.

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

* Re: 2.6.24-mm1: ppc32: too few arguments to function 'reserve_bootmem'
  2008-02-04 22:40   ` Andrew Morton
@ 2008-02-05 13:00     ` Sergei Shtylyov
  2008-02-05 13:25     ` Bernhard Walle
  1 sibling, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2008-02-05 13:00 UTC (permalink / raw)
  To: Andrew Morton
  Cc: linuxppc-dev, Mariusz Kozlowski, paulus, bwalle, linux-kernel

Hello.

Andrew Morton wrote:

>>	This is from ppc32:

>>  CC      arch/powerpc/mm/mem.o
>>arch/powerpc/mm/mem.c: In function 'do_init_bootmem':
>>arch/powerpc/mm/mem.c:256: error: too few arguments to function 'reserve_bootmem'
>>arch/powerpc/mm/mem.c:261: error: too few arguments to function 'reserve_bootmem'

>>Leftover from introduce-flags-for-reserve_bootmem.patch?

> Yes, I've had to fix that patch many times.

> --- a/arch/powerpc/mm/mem.c~introduce-flags-for-reserve_bootmem-powerpc-fix
> +++ a/arch/powerpc/mm/mem.c
> @@ -253,12 +253,13 @@ void __init do_init_bootmem(void)
>  				     lmb_size_bytes(&lmb.reserved, i) - 1;
>  		if (addr < total_lowmem)
>  			reserve_bootmem(lmb.reserved.region[i].base,
> -					lmb_size_bytes(&lmb.reserved, i));
> +					lmb_size_bytes(&lmb.reserved, i),
> +					BOOTMEM_DEFAULT);
>  		else if (lmb.reserved.region[i].base < total_lowmem) {
>  			unsigned long adjusted_size = total_lowmem -
>  				      lmb.reserved.region[i].base;
>  			reserve_bootmem(lmb.reserved.region[i].base,
> -					adjusted_size);
> +					adjusted_size, BOOTMEM_DWEFAULT);

    BOOTMEM_DWEFAULT, are you sure? :-)

WBR, Sergei

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

* Re: 2.6.24-mm1: ppc32: too few arguments to function 'reserve_bootmem'
  2008-02-04 22:40   ` Andrew Morton
  2008-02-05 13:00     ` Sergei Shtylyov
@ 2008-02-05 13:25     ` Bernhard Walle
  1 sibling, 0 replies; 4+ messages in thread
From: Bernhard Walle @ 2008-02-05 13:25 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linuxppc-dev, Mariusz Kozlowski, paulus, linux-kernel

* Andrew Morton <akpm@linux-foundation.org> [2008-02-04 23:40]:
> We did this wrong.  We should have introduced a new reserve_bootmem_foo()
> and migrated over to that in stages.  Once all callers are migrated, remove
> the old interface.

Well, my original proposal was to add a new function but then someone
complained that we already have too much bootmem functions. I don't
remember if this was on LKML or internally in Bugzilla.

However, sorry, it was my fault of course.


        Bernhard

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

end of thread, other threads:[~2008-02-05 13:25 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20080203171634.58ab668b.akpm@linux-foundation.org>
2008-02-04 20:29 ` 2.6.24-mm1: ppc32: too few arguments to function 'reserve_bootmem' Mariusz Kozlowski
2008-02-04 22:40   ` Andrew Morton
2008-02-05 13:00     ` Sergei Shtylyov
2008-02-05 13:25     ` Bernhard Walle

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).