diff options
Diffstat (limited to 'arch/alpha/kernel/smp.c')
-rw-r--r-- | arch/alpha/kernel/smp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index b28731437c31..ad176441be55 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
19 | #include <linux/err.h> | ||
19 | #include <linux/threads.h> | 20 | #include <linux/threads.h> |
20 | #include <linux/smp.h> | 21 | #include <linux/smp.h> |
21 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
@@ -358,7 +359,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle) | |||
358 | /* | 359 | /* |
359 | * Bring one cpu online. | 360 | * Bring one cpu online. |
360 | */ | 361 | */ |
361 | static int __devinit | 362 | static int __cpuinit |
362 | smp_boot_one_cpu(int cpuid) | 363 | smp_boot_one_cpu(int cpuid) |
363 | { | 364 | { |
364 | struct task_struct *idle; | 365 | struct task_struct *idle; |
@@ -487,7 +488,7 @@ smp_prepare_boot_cpu(void) | |||
487 | { | 488 | { |
488 | } | 489 | } |
489 | 490 | ||
490 | int __devinit | 491 | int __cpuinit |
491 | __cpu_up(unsigned int cpu) | 492 | __cpu_up(unsigned int cpu) |
492 | { | 493 | { |
493 | smp_boot_one_cpu(cpu); | 494 | smp_boot_one_cpu(cpu); |
@@ -541,7 +542,7 @@ smp_percpu_timer_interrupt(struct pt_regs *regs) | |||
541 | set_irq_regs(old_regs); | 542 | set_irq_regs(old_regs); |
542 | } | 543 | } |
543 | 544 | ||
544 | int __init | 545 | int |
545 | setup_profiling_timer(unsigned int multiplier) | 546 | setup_profiling_timer(unsigned int multiplier) |
546 | { | 547 | { |
547 | return -EINVAL; | 548 | return -EINVAL; |