Skip to contentSkip to conversation

x86_64: fix section mismatch warning in init.c

PATCH Applied Sam Ravnborg 1 participant 1 message Jul 20, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 5/7 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.

---
 arch/x86_64/mm/init.c |    2 +-
 mm/sparse.c           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86_64/mm/init.c +1 -1
index 9a0e98a..75afe9c 100644
@@ -769,7 +769,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);
mm/sparse.c +1 -1
index e03b39f..3047bf0 100644
@@ -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;
Signature · 1 line
1.5.1.rc3.g84b7-dirty