Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dec2e6b7aa5d45bc3508e19907a7716b0c5307e5
Commit: dec2e6b7aa5d45bc3508e19907a7716b0c5307e5
Parent: 7aa6ec56b9e9e95eb6c83516ddbb6159fd11c224
Author: Sam Ravnborg <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 22 11:12:44 2007 +0200
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Jul 22 11:03:38 2007 -0700
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 <[EMAIL PROTECTED]>
Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
arch/x86_64/mm/init.c | 2 +-
mm/sparse.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 314e12b..38f5d63 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 e03b39f..3047bf0 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
