calibrate_delay() must be __cpuinit
commit6c81c32f9616fd6f2795dceae2f70943cb4d8609
authorAdrian Bunk <bunk@kernel.org>
Wed, 6 Feb 2008 09:37:51 +0000 (6 01:37 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 18:41:08 +0000 (6 10:41 -0800)
treefcafa4b8b071fc9d3a8ea87fd7a1fefca965a5a4
parenteb38a996ebacefe4ce2274de901138505d9cc96b
calibrate_delay() must be __cpuinit

calibrate_delay() must be __cpuinit, not __{dev,}init.

I've verified that this is correct for all users.

While doing the latter, I also did the following cleanups:
- remove pointless additional prototypes in C files
- ensure all users #include <linux/delay.h>

This fixes the following section mismatches with CONFIG_HOTPLUG=n,
CONFIG_HOTPLUG_CPU=y:

WARNING: vmlinux.o(.text+0x1128d): Section mismatch: reference to .init.text.1:calibrate_delay (between 'check_cx686_slop' and 'set_cx86_reorder')
WARNING: vmlinux.o(.text+0x25102): Section mismatch: reference to .init.text.1:calibrate_delay (between 'smp_callin' and 'cpu_coregroup_map')

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Christian Zankel <chris@zankel.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 files changed:
arch/alpha/kernel/smp.c
arch/frv/kernel/setup.c
arch/ia64/kernel/smpboot.c
arch/mips/kernel/smp.c
arch/powerpc/platforms/powermac/cpufreq_32.c
arch/sparc/kernel/sun4d_smp.c
arch/sparc/kernel/sun4m_smp.c
arch/sparc64/kernel/smp.c
arch/x86/kernel/cpu/cyrix.c
arch/x86/kernel/smpboot_32.c
arch/x86/mach-voyager/voyager_smp.c
arch/xtensa/kernel/time.c
drivers/s390/sysinfo.c
init/calibrate.c