x86: Fix section mismatches in mpparse.
PATCH 1/1 x86: Fix section mismatches in mpparse.
Impact: fix section mismatch
In arch/x86/kernel/mpparse.c, smp_reserve_bootmem() has been called and also refers to a function which is in .init section. Thus causes the first warning. And check_irq_src() also requires an __init, because it refers to an .init section.
Thanks
LD arch/x86/kernel/built-in.o
WARNING: arch/x86/kernel/built-in.o(.text+0x10881): Section mismatch in reference from the function smp_reserve_bootmem() to the function .init.text:get_mpc_size()
The function smp_reserve_bootmem() references
the function __init get_mpc_size().
This is often because smp_reserve_bootmem lacks a __init annotation or the annotation of get_mpc_size is wrong.
WARNING: arch/x86/kernel/built-in.o(.text+0x108d9): Section mismatch in reference from the function check_irq_src() to the function .init.text:get_MP_intsrc_index()
The function check_irq_src() references
the function __init get_MP_intsrc_index().
This is often because check_irq_src lacks a __init annotation or the annotation of get_MP_intsrc_index is wrong.
WARNING: arch/x86/kernel/built-in.o(.text+0x108ed): Section mismatch in reference from the function check_irq_src() to the function .init.text:assign_to_mpc_intsrc()
The function check_irq_src() references
the function __init assign_to_mpc_intsrc().
This is often because check_irq_src lacks a __init annotation or the annotation of assign_to_mpc_intsrc is wrong.
WARNING: arch/x86/kernel/built-in.o(.text+0x10908): Section mismatch in reference from the function check_irq_src() to the function .init.text:print_mp_irq_info()
The function check_irq_src() references
the function __init print_mp_irq_info().
This is often because check_irq_src lacks a __init annotation or the annotation of print_mp_irq_info is wrong.
WARNING: arch/x86/kernel/built-in.o(.text+0x1091a): Section mismatch in reference from the function check_irq_src() to the variable .init.data:m_spare
The function check_irq_src() references
the variable __initdata m_spare.
This is often because check_irq_src lacks a __initdata annotation or the annotation of m_spare is wrong.
arch/x86/kernel/mpparse.c +4 -3
@@ -679,7 +679,7 @@ void __init get_smp_config(void)__get_smp_config (0 ); } -static void smp_reserve_bootmem (struct mpf_intel *mpf) +static void __init smp_reserve_bootmem (struct mpf_intel *mpf) {unsigned long size =get_mpc_size (mpf->physptr);#ifdef CONFIG_X86_32
@@ -838,7 +838,7 @@ static int __init get_MP_intsrc_index(sstatic struct mpc_intsrc __initdata *m_spare[SPARE_SLOT_NUM ]; -static void check_irq_src (struct mpc_intsrc *m,int *nr_m_spare) +static void __init check_irq_src (struct mpc_intsrc *m,int *nr_m_spare) {int i;
@@ -866,7 +866,8 @@ static void check_irq_src(struct mpc_int } }#else /* CONFIG_X86_IO_APIC */ -static inline void check_irq_src (struct mpc_intsrc *m,int *nr_m_spare) {} +static +inline void __init check_irq_src (struct mpc_intsrc *m,int *nr_m_spare) {}#endif /* CONFIG_X86_IO_APIC */ static int check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length,
[tip:x86/urgent] x86: Fix section mismatches in mpparse
Commit-ID: 575922248c0df490843ddfbcf3bc65b54c4adb08 Gitweb: http://git.kernel.org/tip/575922248c0df490843ddfbcf3bc65b54c4adb08 Author: Rakib Mullick <[email protected]> AuthorDate: Sat, 11 Apr 2009 09:04:59 +0600 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 12 Apr 2009 12:32:18 +0200
x86: Fix section mismatches in mpparse
Impact: fix section mismatch
In arch/x86/kernel/mpparse.c, smp_reserve_bootmem() has been called and also refers to a function which is in .init section. Thus causes the first warning. And check_irq_src() also requires an __init, because it refers to an .init section.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/mpparse.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
arch/x86/kernel/mpparse.c +4 -3
@@ -679,7 +679,7 @@ void __init get_smp_config(void)__get_smp_config (0 ); } -static void smp_reserve_bootmem (struct mpf_intel *mpf) +static void __init smp_reserve_bootmem (struct mpf_intel *mpf) {unsigned long size =get_mpc_size (mpf->physptr);#ifdef CONFIG_X86_32
@@ -838,7 +838,7 @@ static int __init get_MP_intsrc_index(struct mpc_intsrc *m)static struct mpc_intsrc __initdata *m_spare[SPARE_SLOT_NUM ]; -static void check_irq_src (struct mpc_intsrc *m,int *nr_m_spare) +static void __init check_irq_src (struct mpc_intsrc *m,int *nr_m_spare) {int i;
@@ -866,7 +866,8 @@ static void check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) } }#else /* CONFIG_X86_IO_APIC */ -static inline void check_irq_src (struct mpc_intsrc *m,int *nr_m_spare) {} +static +inline void __init check_irq_src (struct mpc_intsrc *m,int *nr_m_spare) {}#endif /* CONFIG_X86_IO_APIC */ static int check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length,