Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a8a27c9 authored by Wu Fengguang's avatar Wu Fengguang Committed by Linus Torvalds
Browse files

generic swap(): sparc: rename swap() to swap_ulong() 



In preparation for the introduction of a generic swap() macro.

Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c19a28e1

arch/sparc/kernel/sun4m_smp.c

+3 −2
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ extern int __smp4m_processor_id(void); 
#define SMP_PRINTK(x)

#endif



static inline unsigned long swap(volatile unsigned long *ptr, unsigned long val)

static inline unsigned long

swap_ulong(volatile unsigned long *ptr, unsigned long val)

{

	__asm__ __volatile__("swap [%1], %0\n\t" :

			     "=&r" (val), "=&r" (ptr) :
@@ -90,7 +91,7 @@ void __cpuinit smp4m_callin(void) 
	 * to call the scheduler code.

	 */

	/* Allow master to continue. */

	swap(&cpu_callin_map[cpuid], 1);

	swap_ulong(&cpu_callin_map[cpuid], 1);



	/* XXX: What's up with all the flushes? */

	local_flush_cache_all();