2008-08-21 13:27:47

by Jan Beulich

Subject: [PATCH] x86-64: fix two modpost warnings in mm/init_64.c

early_io{re,un}map() are __init and hence can't be called from __meminit
functions.

Signed-off-by: Jan Beulich <[email protected]>

---
arch/x86/mm/init_64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.27-rc4/arch/x86/mm/init_64.c 2008-08-21 15:02:41.000000000 +0200
+++ 2.6.27-rc4-x86_64-modpost-mm-init/arch/x86/mm/init_64.c 2008-08-21 11:49:44.000000000 +0200
@@ -241,7 +241,7 @@ static unsigned long __initdata table_st
static unsigned long __meminitdata table_end;
static unsigned long __meminitdata table_top;

-static __meminit void *alloc_low_page(unsigned long *phys)
+static __ref void *alloc_low_page(unsigned long *phys)
{
unsigned long pfn = table_end++;
void *adr;
@@ -262,7 +262,7 @@ static __meminit void *alloc_low_page(un
return adr;
}

-static __meminit void unmap_low_page(void *adr)
+static __ref void unmap_low_page(void *adr)
{
if (after_bootmem)
return;

2008-08-21 14:06:55

by Rufus & Azrael

Subject: Re:[PATCH] x86-64: fix two modpost warnings in mm/init_64.c

> early_io{re,un}map() are __init and hence can't be called from __meminit
> functions.
> Signed-off-by: Jan Beulich<[email protected]>
>
> ---
> arch/x86/mm/init_64.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> --- linux-2.6.27-rc4/arch/x86/mm/init_64.c 2008-08-21 15:02:41.000000000 +0200
> +++ 2.6.27-rc4-x86_64-modpost-mm-init/arch/x86/mm/init_64.c 2008-08-21 11:49:44.000000000 +0200
> @@ -241,7 +241,7 @@ static unsigned long __initdata table_st
> static unsigned long __meminitdata table_end;
> static unsigned long __meminitdata table_top;
>
> -static __meminit void *alloc_low_page(unsigned long *phys)
> +static __ref void *alloc_low_page(unsigned long *phys)
> {
> unsigned long pfn = table_end++;
> void *adr;
> @@ -262,7 +262,7 @@ static __meminit void *alloc_low_page(un
> return adr;
> }
>
> -static __meminit void unmap_low_page(void *adr)
> +static __ref void unmap_low_page(void *adr)
> {
> if (after_bootmem)
> return;
>
>
>
Hi Jan,

I have tested your patch, it works fine on my amd64 box and the three
section mismatches in cause have desapparead.

Thanks and regards.

2008-08-22 05:56:27

by Ingo Molnar

Subject: Re: [PATCH] x86-64: fix two modpost warnings in mm/init_64.c

* Jan Beulich <[email protected]> wrote:

> early_io{re,un}map() are __init and hence can't be called from
> __meminit functions.

applied to tip/x86/urgent - thanks Jan!

Ingo