aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-17 08:49:35 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 11:01:07 -0700
commitcc040a8a0e8ba95fbb0ae1edcb9ec83623b422e3 (patch)
treee86350f03ca943c635456eeec90f7798bc13586f /arch
parent5072d5d58ef67bd7131d0be208ad1b6cd0631648 (diff)
downloadkernel_samsung_crespo-cc040a8a0e8ba95fbb0ae1edcb9ec83623b422e3.zip
kernel_samsung_crespo-cc040a8a0e8ba95fbb0ae1edcb9ec83623b422e3.tar.gz
kernel_samsung_crespo-cc040a8a0e8ba95fbb0ae1edcb9ec83623b422e3.tar.bz2
alpha __init fixes
__init and __initdata stuff used from __devinit one Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/kernel/smp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 80cfb75..b287314 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -65,7 +65,7 @@ enum ipi_message_type {
};
/* Set to a secondary's cpuid when it comes online. */
-static int smp_secondary_alive __initdata = 0;
+static int smp_secondary_alive __devinitdata = 0;
/* Which cpus ids came online. */
cpumask_t cpu_online_map;
@@ -173,7 +173,7 @@ smp_callin(void)
}
/* Wait until hwrpb->txrdy is clear for cpu. Return -1 on timeout. */
-static int __init
+static int __devinit
wait_for_txrdy (unsigned long cpumask)
{
unsigned long timeout;
@@ -358,7 +358,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle)
/*
* Bring one cpu online.
*/
-static int __init
+static int __devinit
smp_boot_one_cpu(int cpuid)
{
struct task_struct *idle;