b282b6f8a8
Compiling the kernel with CONFIG_HOTPLUG = y and CONFIG_HOTPLUG_CPU = n with CONFIG_RELOCATABLE = y generates the following modpost warnings WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141b7d) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141b9c) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.text:__cpu_up from .text between '_cpu_up' (at offset 0xc0141bd8) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141c05) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141c26) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141c37) and 'cpu_up' This is because cpu_up, _cpu_up and __cpu_up (in some architectures) are defined as __devinit AND __cpu_up calls some __cpuinit functions. Since __cpuinit would map to __init with this kind of a configuration, we get a .text refering .init.data warning. This patch solves the problem by converting all of __cpu_up, _cpu_up and cpu_up from __devinit to __cpuinit. The approach is justified since the callers of cpu_up are either dependent on CONFIG_HOTPLUG_CPU or are of __init type. Thus when CONFIG_HOTPLUG_CPU=y, all these cpu up functions would land up in .text section, and when CONFIG_HOTPLUG_CPU=n, all these functions would land up in .init section. Tested on a i386 SMP machine running linux-2.6.20-rc3-mm1. Signed-off-by: Gautham R Shenoy <ego@in.ibm.com> Cc: Vivek Goyal <vgoyal@in.ibm.com> Cc: Mikael Starvik <starvik@axis.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> |
||
|---|---|---|
| .. | ||
| asm-offsets.c | ||
| audit.c | ||
| auxio.c | ||
| binfmt_aout32.c | ||
| binfmt_elf32.c | ||
| central.c | ||
| chmc.c | ||
| compat_audit.c | ||
| cpu.c | ||
| devices.c | ||
| dtlb_miss.S | ||
| dtlb_prot.S | ||
| ebus.c | ||
| entry.S | ||
| etrap.S | ||
| head.S | ||
| idprom.c | ||
| init_task.c | ||
| iommu_common.c | ||
| iommu_common.h | ||
| irq.c | ||
| isa.c | ||
| itlb_miss.S | ||
| kprobes.c | ||
| ktlb.S | ||
| Makefile | ||
| module.c | ||
| of_device.c | ||
| pci_common.c | ||
| pci_impl.h | ||
| pci_iommu.c | ||
| pci_psycho.c | ||
| pci_sabre.c | ||
| pci_schizo.c | ||
| pci_sun4v_asm.S | ||
| pci_sun4v.c | ||
| pci_sun4v.h | ||
| pci.c | ||
| power.c | ||
| process.c | ||
| prom.c | ||
| ptrace.c | ||
| rtrap.S | ||
| sbus.c | ||
| semaphore.c | ||
| setup.c | ||
| signal32.c | ||
| signal.c | ||
| smp.c | ||
| sparc64_ksyms.c | ||
| stacktrace.c | ||
| starfire.c | ||
| sun4v_ivec.S | ||
| sun4v_tlb_miss.S | ||
| sunos_ioctl32.c | ||
| sys32.S | ||
| sys_sparc32.c | ||
| sys_sparc.c | ||
| sys_sunos32.c | ||
| systbls.S | ||
| time.c | ||
| trampoline.S | ||
| traps.c | ||
| tsb.S | ||
| ttable.S | ||
| una_asm.S | ||
| unaligned.c | ||
| us2e_cpufreq.c | ||
| us3_cpufreq.c | ||
| visemul.c | ||
| vmlinux.lds.S | ||
| winfixup.S | ||