Commit b282b6f8 authored Jan 10, 2007 by Gautham R Shenoy Committed by Linus Torvalds Jan 11, 2007

[PATCH] Change cpu_up and co from devinit to cpuinit



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>

parent 0d103e90

arch/cris/arch-v32/kernel/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ int setup_profiling_timer(unsigned int multiplier)
		*/
		unsigned long cache_decay_ticks = 1;

		int __devinit __cpu_up(unsigned int cpu)
		int __cpuinit __cpu_up(unsigned int cpu)
		{
		smp_boot_one_cpu(cpu);
		return cpu_online(cpu) ? 0 : -ENOSYS;

arch/m32r/kernel/smpboot.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -351,7 +351,7 @@ static void __init do_boot_cpu(int phys_id)
		}
		}

		int __devinit __cpu_up(unsigned int cpu_id)
		int __cpuinit __cpu_up(unsigned int cpu_id)
		{
		int timeout;

arch/mips/kernel/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -271,7 +271,7 @@ void __devinit smp_prepare_boot_cpu(void)
		* and keep control until "cpu_online(cpu)" is set. Note: cpu is
		* physical, not logical.
		*/
		int __devinit __cpu_up(unsigned int cpu)
		int __cpuinit __cpu_up(unsigned int cpu)
		{
		struct task_struct *idle;

arch/parisc/kernel/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -608,7 +608,7 @@ void smp_cpus_done(unsigned int cpu_max)
		}


		int __devinit __cpu_up(unsigned int cpu)
		int __cpuinit __cpu_up(unsigned int cpu)
		{
		if (cpu != 0 && cpu < parisc_max_cpus)
		smp_boot_one_cpu(cpu);

arch/powerpc/kernel/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -468,7 +468,7 @@ static int __devinit cpu_enable(unsigned int cpu)
		return -ENOSYS;
		}

		int __devinit __cpu_up(unsigned int cpu)
		int __cpuinit __cpu_up(unsigned int cpu)
		{
		int c;

Admin message