diff options
Diffstat (limited to 'arch/sparc/kernel/sun4m_smp.c')
-rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 4f8d60586b07..8040376c4890 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -54,7 +54,8 @@ extern int __smp4m_processor_id(void); | |||
54 | #define SMP_PRINTK(x) | 54 | #define SMP_PRINTK(x) |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | static inline unsigned long swap(volatile unsigned long *ptr, unsigned long val) | 57 | static inline unsigned long |
58 | swap_ulong(volatile unsigned long *ptr, unsigned long val) | ||
58 | { | 59 | { |
59 | __asm__ __volatile__("swap [%1], %0\n\t" : | 60 | __asm__ __volatile__("swap [%1], %0\n\t" : |
60 | "=&r" (val), "=&r" (ptr) : | 61 | "=&r" (val), "=&r" (ptr) : |
@@ -90,7 +91,7 @@ void __cpuinit smp4m_callin(void) | |||
90 | * to call the scheduler code. | 91 | * to call the scheduler code. |
91 | */ | 92 | */ |
92 | /* Allow master to continue. */ | 93 | /* Allow master to continue. */ |
93 | swap(&cpu_callin_map[cpuid], 1); | 94 | swap_ulong(&cpu_callin_map[cpuid], 1); |
94 | 95 | ||
95 | /* XXX: What's up with all the flushes? */ | 96 | /* XXX: What's up with all the flushes? */ |
96 | local_flush_cache_all(); | 97 | local_flush_cache_all(); |