summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/smpboot.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-24 17:38:18 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-24 17:38:18 -0700
commit9059b454248a060ab39346c5d079f56089ab3868 (patch)
tree5d5df323bd91613bd8ed643e7a197ef46dea91ff /arch/ia64/kernel/smpboot.c
parent9539ce2253ab1b054e9b0daf0abe0fd4263e1820 (diff)
parentd57c4a38928ab2f71542046a9bae2932006b2523 (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] acpi_get_sysname() should be __init [IA64] Cleanup acpi header to reuse the generic _PDC defines [IA64] Fix using uninitialized data in _PDC setup [IA64] start_secondary() and smp_callin() should be __cpuinit
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
-rw-r--r--arch/ia64/kernel/smpboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 542958079f1..3c9d8e6089c 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -370,7 +370,7 @@ smp_setup_percpu_timer (void)
{
}
-static void __devinit
+static void __cpuinit
smp_callin (void)
{
int cpuid, phys_id, itc_master;
@@ -456,7 +456,7 @@ smp_callin (void)
/*
* Activate a secondary processor. head.S calls this.
*/
-int __devinit
+int __cpuinit
start_secondary (void *unused)
{
/* Early console may use I/O ports */