diff options
Diffstat (limited to 'arch/arm/kernel/smp.c')
-rw-r--r-- | arch/arm/kernel/smp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index c5fb5469054b..c2b4f8f0be9a 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -58,7 +58,7 @@ struct secondary_data secondary_data; | |||
58 | * control for which core is the next to come out of the secondary | 58 | * control for which core is the next to come out of the secondary |
59 | * boot "holding pen" | 59 | * boot "holding pen" |
60 | */ | 60 | */ |
61 | volatile int __cpuinitdata pen_release = -1; | 61 | volatile int pen_release = -1; |
62 | 62 | ||
63 | enum ipi_msg_type { | 63 | enum ipi_msg_type { |
64 | IPI_WAKEUP, | 64 | IPI_WAKEUP, |
@@ -86,7 +86,7 @@ static unsigned long get_arch_pgd(pgd_t *pgd) | |||
86 | return pgdir >> ARCH_PGD_SHIFT; | 86 | return pgdir >> ARCH_PGD_SHIFT; |
87 | } | 87 | } |
88 | 88 | ||
89 | int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle) | 89 | int __cpu_up(unsigned int cpu, struct task_struct *idle) |
90 | { | 90 | { |
91 | int ret; | 91 | int ret; |
92 | 92 | ||
@@ -138,7 +138,7 @@ void __init smp_init_cpus(void) | |||
138 | smp_ops.smp_init_cpus(); | 138 | smp_ops.smp_init_cpus(); |
139 | } | 139 | } |
140 | 140 | ||
141 | int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) | 141 | int boot_secondary(unsigned int cpu, struct task_struct *idle) |
142 | { | 142 | { |
143 | if (smp_ops.smp_boot_secondary) | 143 | if (smp_ops.smp_boot_secondary) |
144 | return smp_ops.smp_boot_secondary(cpu, idle); | 144 | return smp_ops.smp_boot_secondary(cpu, idle); |
@@ -170,7 +170,7 @@ static int platform_cpu_disable(unsigned int cpu) | |||
170 | /* | 170 | /* |
171 | * __cpu_disable runs on the processor to be shutdown. | 171 | * __cpu_disable runs on the processor to be shutdown. |
172 | */ | 172 | */ |
173 | int __cpuinit __cpu_disable(void) | 173 | int __cpu_disable(void) |
174 | { | 174 | { |
175 | unsigned int cpu = smp_processor_id(); | 175 | unsigned int cpu = smp_processor_id(); |
176 | int ret; | 176 | int ret; |
@@ -216,7 +216,7 @@ static DECLARE_COMPLETION(cpu_died); | |||
216 | * called on the thread which is asking for a CPU to be shutdown - | 216 | * called on the thread which is asking for a CPU to be shutdown - |
217 | * waits until shutdown has completed, or it is timed out. | 217 | * waits until shutdown has completed, or it is timed out. |
218 | */ | 218 | */ |
219 | void __cpuinit __cpu_die(unsigned int cpu) | 219 | void __cpu_die(unsigned int cpu) |
220 | { | 220 | { |
221 | if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) { | 221 | if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) { |
222 | pr_err("CPU%u: cpu didn't die\n", cpu); | 222 | pr_err("CPU%u: cpu didn't die\n", cpu); |
@@ -306,7 +306,7 @@ void __ref cpu_die(void) | |||
306 | * Called by both boot and secondaries to move global data into | 306 | * Called by both boot and secondaries to move global data into |
307 | * per-processor storage. | 307 | * per-processor storage. |
308 | */ | 308 | */ |
309 | static void __cpuinit smp_store_cpu_info(unsigned int cpuid) | 309 | static void smp_store_cpu_info(unsigned int cpuid) |
310 | { | 310 | { |
311 | struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid); | 311 | struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid); |
312 | 312 | ||
@@ -322,7 +322,7 @@ static void percpu_timer_setup(void); | |||
322 | * This is the secondary CPU boot entry. We're using this CPUs | 322 | * This is the secondary CPU boot entry. We're using this CPUs |
323 | * idle thread stack, but a set of temporary page tables. | 323 | * idle thread stack, but a set of temporary page tables. |
324 | */ | 324 | */ |
325 | asmlinkage void __cpuinit secondary_start_kernel(void) | 325 | asmlinkage void secondary_start_kernel(void) |
326 | { | 326 | { |
327 | struct mm_struct *mm = &init_mm; | 327 | struct mm_struct *mm = &init_mm; |
328 | unsigned int cpu; | 328 | unsigned int cpu; |
@@ -521,7 +521,7 @@ static void broadcast_timer_set_mode(enum clock_event_mode mode, | |||
521 | { | 521 | { |
522 | } | 522 | } |
523 | 523 | ||
524 | static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt) | 524 | static void broadcast_timer_setup(struct clock_event_device *evt) |
525 | { | 525 | { |
526 | evt->name = "dummy_timer"; | 526 | evt->name = "dummy_timer"; |
527 | evt->features = CLOCK_EVT_FEAT_ONESHOT | | 527 | evt->features = CLOCK_EVT_FEAT_ONESHOT | |
@@ -550,7 +550,7 @@ int local_timer_register(struct local_timer_ops *ops) | |||
550 | } | 550 | } |
551 | #endif | 551 | #endif |
552 | 552 | ||
553 | static void __cpuinit percpu_timer_setup(void) | 553 | static void percpu_timer_setup(void) |
554 | { | 554 | { |
555 | unsigned int cpu = smp_processor_id(); | 555 | unsigned int cpu = smp_processor_id(); |
556 | struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu); | 556 | struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu); |