diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
| commit | 72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch) | |
| tree | 5fd25748f7f5640f8ee8efb86ddca88d12840791 /arch/sparc/kernel/sun4d_smp.c | |
| parent | 67fbc2312312095acc2f19a0b601bac10f84cf9d (diff) | |
| parent | 58c2467355ed3154a12ee49d8f8236547145c9d3 (diff) | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/sparc/kernel/sun4d_smp.c')
| -rw-r--r-- | arch/sparc/kernel/sun4d_smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index 7a6a5e795928..16ab0cb731c5 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
| @@ -83,7 +83,7 @@ static inline void show_leds(int cpuid) | |||
| 83 | "i" (ASI_M_CTL)); | 83 | "i" (ASI_M_CTL)); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | void __init smp4d_callin(void) | 86 | void __cpuinit smp4d_callin(void) |
| 87 | { | 87 | { |
| 88 | int cpuid = hard_smp4d_processor_id(); | 88 | int cpuid = hard_smp4d_processor_id(); |
| 89 | extern spinlock_t sun4d_imsk_lock; | 89 | extern spinlock_t sun4d_imsk_lock; |
| @@ -386,7 +386,7 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs) | |||
| 386 | 386 | ||
| 387 | extern unsigned int lvl14_resolution; | 387 | extern unsigned int lvl14_resolution; |
| 388 | 388 | ||
| 389 | static void __init smp_setup_percpu_timer(void) | 389 | static void __cpuinit smp_setup_percpu_timer(void) |
| 390 | { | 390 | { |
| 391 | int cpu = hard_smp4d_processor_id(); | 391 | int cpu = hard_smp4d_processor_id(); |
| 392 | 392 | ||