diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-07-17 03:49:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 14:01:07 -0400 |
commit | cc040a8a0e8ba95fbb0ae1edcb9ec83623b422e3 (patch) | |
tree | e86350f03ca943c635456eeec90f7798bc13586f /arch/alpha/kernel/smp.c | |
parent | 5072d5d58ef67bd7131d0be208ad1b6cd0631648 (diff) |
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/alpha/kernel/smp.c')
-rw-r--r-- | arch/alpha/kernel/smp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index 80cfb758ee2b..b28731437c31 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c | |||
@@ -65,7 +65,7 @@ enum ipi_message_type { | |||
65 | }; | 65 | }; |
66 | 66 | ||
67 | /* Set to a secondary's cpuid when it comes online. */ | 67 | /* Set to a secondary's cpuid when it comes online. */ |
68 | static int smp_secondary_alive __initdata = 0; | 68 | static int smp_secondary_alive __devinitdata = 0; |
69 | 69 | ||
70 | /* Which cpus ids came online. */ | 70 | /* Which cpus ids came online. */ |
71 | cpumask_t cpu_online_map; | 71 | cpumask_t cpu_online_map; |
@@ -173,7 +173,7 @@ smp_callin(void) | |||
173 | } | 173 | } |
174 | 174 | ||
175 | /* Wait until hwrpb->txrdy is clear for cpu. Return -1 on timeout. */ | 175 | /* Wait until hwrpb->txrdy is clear for cpu. Return -1 on timeout. */ |
176 | static int __init | 176 | static int __devinit |
177 | wait_for_txrdy (unsigned long cpumask) | 177 | wait_for_txrdy (unsigned long cpumask) |
178 | { | 178 | { |
179 | unsigned long timeout; | 179 | unsigned long timeout; |
@@ -358,7 +358,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle) | |||
358 | /* | 358 | /* |
359 | * Bring one cpu online. | 359 | * Bring one cpu online. |
360 | */ | 360 | */ |
361 | static int __init | 361 | static int __devinit |
362 | smp_boot_one_cpu(int cpuid) | 362 | smp_boot_one_cpu(int cpuid) |
363 | { | 363 | { |
364 | struct task_struct *idle; | 364 | struct task_struct *idle; |