From: Sam Ravnborg Date: Sun, 22 Jul 2007 09:12:44 +0000 (+0200) Subject: x86_64: fix section mismatch warning in init.c X-Git-Tag: v2.6.23-rc1~21 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dec2e6b7aa5d45bc3508e19907a7716b0c5307e5;p=linux-2.6-omap-h63xx.git x86_64: fix section mismatch warning in init.c Fix following warning: WARNING: vmlinux.o(.text+0x188ea): Section mismatch: reference to .init.text:__alloc_bootmem_core (between 'alloc_bootmem_high_node' and 'get_gate_vma') alloc_bootmem_high_node() is only used from __init scope so declare it __init. And in addition declare the weak variant __init too. Signed-off-by: Sam Ravnborg Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c index 314e12b2209..38f5d636800 100644 --- a/arch/x86_64/mm/init.c +++ b/arch/x86_64/mm/init.c @@ -724,7 +724,7 @@ int in_gate_area_no_task(unsigned long addr) return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END); } -void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) +void * __init alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) { return __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0); diff --git a/mm/sparse.c b/mm/sparse.c index e03b39f3540..3047bf06c1f 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -209,7 +209,7 @@ static int __meminit sparse_init_one_section(struct mem_section *ms, return 1; } -__attribute__((weak)) +__attribute__((weak)) __init void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) { return NULL;