|
@@ -60,7 +60,7 @@ extern int __smp4d_processor_id(void);
|
|
#define SMP_PRINTK(x)
|
|
#define SMP_PRINTK(x)
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-static inline unsigned long swap(volatile unsigned long *ptr, unsigned long val)
|
|
|
|
|
|
+static inline unsigned long sun4d_swap(volatile unsigned long *ptr, unsigned long val)
|
|
{
|
|
{
|
|
__asm__ __volatile__("swap [%1], %0\n\t" :
|
|
__asm__ __volatile__("swap [%1], %0\n\t" :
|
|
"=&r" (val), "=&r" (ptr) :
|
|
"=&r" (val), "=&r" (ptr) :
|
|
@@ -115,7 +115,7 @@ void __cpuinit smp4d_callin(void)
|
|
local_flush_tlb_all();
|
|
local_flush_tlb_all();
|
|
|
|
|
|
/* Allow master to continue. */
|
|
/* Allow master to continue. */
|
|
- swap((unsigned long *)&cpu_callin_map[cpuid], 1);
|
|
|
|
|
|
+ sun4d_swap((unsigned long *)&cpu_callin_map[cpuid], 1);
|
|
local_flush_cache_all();
|
|
local_flush_cache_all();
|
|
local_flush_tlb_all();
|
|
local_flush_tlb_all();
|
|
|
|
|