section mismatch for acpi_unmap_lsapic()
Commit 13ad20c1 "x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved" in linux-next added code to acpi_unmap_lsapic() that causes section mismatch warnings:
WARNING: vmlinux.o(.text+0x694f2): Section mismatch in reference from the function acpi_unmap_lsapic()
to the function .cpuinit.text:numa_clear_node()
WARNING: vmlinux.o(.text+0x694eb): Section mismatch in reference from the function acpi_unmap_lsapic()
to the variable .cpuinit.data:__apicid_to_node
Does acpi_unmap_lsapic() need a wrapper like the one that was made for acpi_map_lsapic() or can it just be annotated __ref ? I guess my question is would be there be a reason that the wrapper was created for acpi_map_lsapic() instead of just annotating __ref besides allowing the code for _apic_map_lsapic() to be dropped when HOTPLUG_CPU wasn't configured?
Jerry
Quoted 10 lines · Jerry Snitselaar
Commit
13ad20c1"x86cpu_hotplug: unmap cpu2node when the cpu is hotremoved" in linux-next added code toacpi_unmap_lsapic()that causes section mismatch warnings:WARNING:
vmlinux.o(.text+0x694f2): Section mismatch in reference from the functionacpi_unmap_lsapic()
to the function .cpuinit.text:numa_clear_node()
WARNING:vmlinux.o(.text+0x694eb): Section mismatch in reference from the functionacpi_unmap_lsapic()
to the variable .cpuinit.data:__apicid_to_node
Quoted 6 lines
Does
acpi_unmap_lsapic()need a wrapper like the one that was made foracpi_map_lsapic()or can it just be annotated__ref? I guess my question is would be there be a reason that the wrapper was created foracpi_map_lsapic()instead of just annotating__refbesides allowing the code for_apic_map_lsapic()to be dropped whenHOTPLUG_CPUwasn't configured?
That commit comes from -mm AFAICS. Involved parties Cc:-ed.
Thanks,
Ingo
At 09/17/2012 07:07 PM, Ingo Molnar Wrote:
Quoted 13 lines · Jerry Snitselaar
Quoted 11 lines
Commit
13ad20c1"x86cpu_hotplug: unmap cpu2node when the cpu is hotremoved" in linux-next added code toacpi_unmap_lsapic()that causes section mismatch warnings:WARNING:
vmlinux.o(.text+0x694f2): Section mismatch in reference from the functionacpi_unmap_lsapic()
to the function .cpuinit.text:numa_clear_node()
WARNING:vmlinux.o(.text+0x694eb): Section mismatch in reference from the functionacpi_unmap_lsapic()
to the variable .cpuinit.data:__apicid_to_node
Quoted 8 lines
Quoted 6 lines
Does
acpi_unmap_lsapic()need a wrapper like the one that was made foracpi_map_lsapic()or can it just be annotated__ref? I guess my question is would be there be a reason that the wrapper was created foracpi_map_lsapic()instead of just annotating__refbesides allowing the code for_apic_map_lsapic()to be dropped whenHOTPLUG_CPUwasn't configured?That commit comes from -mm AFAICS. Involved parties Cc:-ed.
Sorry for introducing this warning. numa_clear_node() is in cpuinit section, and it will be called in acpi_unmap_lsapic(), so I agree to add __ref to this function. Should I need to post another patch to fix it or just update the patch?
Thanks
Wen Congyang
Quoted 5 lines
Thanks,
Ingo
Quoted 21 lines · On Tue, 18 Sep 2012 09:40:51 +0800 Wen Congyang <[email protected]> wrote:
At 09/17/2012 07:07 PM, Ingo Molnar Wrote:
Quoted 20 lines · Jerry Snitselaar
Quoted 17 lines
Commit
13ad20c1"x86cpu_hotplug: unmap cpu2node when the cpu is hotremoved" in linux-next added code toacpi_unmap_lsapic()that causes section mismatch warnings:WARNING:
vmlinux.o(.text+0x694f2): Section mismatch in reference from the functionacpi_unmap_lsapic()
to the function .cpuinit.text:numa_clear_node()
WARNING:vmlinux.o(.text+0x694eb): Section mismatch in reference from the functionacpi_unmap_lsapic()
to the variable .cpuinit.data:__apicid_to_nodeDoes
acpi_unmap_lsapic()need a wrapper like the one that was made foracpi_map_lsapic()or can it just be annotated__ref? I guess my question is would be there be a reason that the wrapper was created foracpi_map_lsapic()instead of just annotating__refbesides allowing the code for_apic_map_lsapic()to be dropped whenHOTPLUG_CPUwasn't configured?
Quoted 6 lines
Quoted 1 line
That commit comes from -mm AFAICS. Involved parties Cc:-ed.
Sorry for introducing this warning.
numa_clear_node()is in cpuinit section, and it will be called inacpi_unmap_lsapic(), so I agree to add__refto this function. Should I need to post another patch to fix it or just update the patch?
Either a new patch or a fixup is OK for me (I'll turn a new patch into a fixup so I and others can see what changed).
People who run git trees prefer fixup patches due to extensive lameness.
I did this:
arch/x86/kernel/acpi/boot.c renamed from arch/x86/kernel/acpi/boot.c~cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix +1 -1
@@ -689,7 +689,7 @@ int __ref acpi_map_lsapic(acpi_handle ha }EXPORT_SYMBOL (acpi_map_lsapic); -int acpi_unmap_lsapic (int cpu) +int __ref acpi_unmap_lsapic (int cpu) {#ifdef CONFIG_ACPI_NUMA set_apicid_to_node (per_cpu (x86_cpu_to_apicid, cpu),NUMA_NO_NODE );
_