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

Commit 5ba840f9 authored by Paul Gortmaker's avatar Paul Gortmaker
Browse files

alpha: fix build failures from system.h dismemberment 



commit ec221208

    "Disintegrate asm/system.h for Alpha"

combined with commit b4816afa

    "Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h"

introduced the concept of asm/cmpxchg.h but the alpha arch
never got one.  Fork the cmpxchg content out of the asm/atomic.h
file to create one.

Some minor whitespace fixups were done on the block of code that
created the new file.

Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Acked-by: default avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 00341028

arch/alpha/include/asm/atomic.h

+1 −67
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/types.h>

#include <asm/barrier.h>

#include <asm/cmpxchg.h>



/*

 * Atomic operations that C can't guarantee us.  Useful for
@@ -168,73 +169,6 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) 
	return result;

}



/*

 * Atomic exchange routines.

 */



#define __ASM__MB

#define ____xchg(type, args...)		__xchg ## type ## _local(args)

#define ____cmpxchg(type, args...)	__cmpxchg ## type ## _local(args)

#include <asm/xchg.h>



#define xchg_local(ptr,x)						\

  ({									\

     __typeof__(*(ptr)) _x_ = (x);					\

     (__typeof__(*(ptr))) __xchg_local((ptr), (unsigned long)_x_,	\

				       sizeof(*(ptr)));			\

  })



#define cmpxchg_local(ptr, o, n)					\

  ({									\

     __typeof__(*(ptr)) _o_ = (o);					\

     __typeof__(*(ptr)) _n_ = (n);					\

     (__typeof__(*(ptr))) __cmpxchg_local((ptr), (unsigned long)_o_,	\

					  (unsigned long)_n_,		\

					  sizeof(*(ptr)));		\

  })



#define cmpxchg64_local(ptr, o, n)					\

  ({									\

	BUILD_BUG_ON(sizeof(*(ptr)) != 8);				\

	cmpxchg_local((ptr), (o), (n));					\

  })



#ifdef CONFIG_SMP

#undef __ASM__MB

#define __ASM__MB	"\tmb\n"

#endif

#undef ____xchg

#undef ____cmpxchg

#define ____xchg(type, args...)		__xchg ##type(args)

#define ____cmpxchg(type, args...)	__cmpxchg ##type(args)

#include <asm/xchg.h>



#define xchg(ptr,x)							\

  ({									\

     __typeof__(*(ptr)) _x_ = (x);					\

     (__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_,		\

				 sizeof(*(ptr)));			\

  })



#define cmpxchg(ptr, o, n)						\

  ({									\

     __typeof__(*(ptr)) _o_ = (o);					\

     __typeof__(*(ptr)) _n_ = (n);					\

     (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_,		\

				    (unsigned long)_n_,	sizeof(*(ptr)));\

  })



#define cmpxchg64(ptr, o, n)						\

  ({									\

	BUILD_BUG_ON(sizeof(*(ptr)) != 8);				\

	cmpxchg((ptr), (o), (n));					\

  })



#undef __ASM__MB

#undef ____cmpxchg



#define __HAVE_ARCH_CMPXCHG 1



#define atomic64_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), old, new))

#define atomic64_xchg(v, new) (xchg(&((v)->counter), new))

arch/alpha/include/asm/cmpxchg.h

0 → 100644
+71 −0
Original line number Diff line number Diff line 
#ifndef _ALPHA_CMPXCHG_H

#define _ALPHA_CMPXCHG_H



/*

 * Atomic exchange routines.

 */



#define __ASM__MB

#define ____xchg(type, args...)		__xchg ## type ## _local(args)

#define ____cmpxchg(type, args...)	__cmpxchg ## type ## _local(args)

#include <asm/xchg.h>



#define xchg_local(ptr, x)						\

({									\

	__typeof__(*(ptr)) _x_ = (x);					\

	(__typeof__(*(ptr))) __xchg_local((ptr), (unsigned long)_x_,	\

				       sizeof(*(ptr)));			\

})



#define cmpxchg_local(ptr, o, n)					\

({									\

	__typeof__(*(ptr)) _o_ = (o);					\

	__typeof__(*(ptr)) _n_ = (n);					\

	(__typeof__(*(ptr))) __cmpxchg_local((ptr), (unsigned long)_o_,	\

					  (unsigned long)_n_,		\

					  sizeof(*(ptr)));		\

})



#define cmpxchg64_local(ptr, o, n)					\

({									\

	BUILD_BUG_ON(sizeof(*(ptr)) != 8);				\

	cmpxchg_local((ptr), (o), (n));					\

})



#ifdef CONFIG_SMP

#undef __ASM__MB

#define __ASM__MB	"\tmb\n"

#endif

#undef ____xchg

#undef ____cmpxchg

#define ____xchg(type, args...)		__xchg ##type(args)

#define ____cmpxchg(type, args...)	__cmpxchg ##type(args)

#include <asm/xchg.h>



#define xchg(ptr, x)							\

({									\

	__typeof__(*(ptr)) _x_ = (x);					\

	(__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_,		\

				 sizeof(*(ptr)));			\

})



#define cmpxchg(ptr, o, n)						\

({									\

	__typeof__(*(ptr)) _o_ = (o);					\

	__typeof__(*(ptr)) _n_ = (n);					\

	(__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_,	\

				    (unsigned long)_n_,	sizeof(*(ptr)));\

})



#define cmpxchg64(ptr, o, n)						\

({									\

	BUILD_BUG_ON(sizeof(*(ptr)) != 8);				\

	cmpxchg((ptr), (o), (n));					\

})



#undef __ASM__MB

#undef ____cmpxchg



#define __HAVE_ARCH_CMPXCHG 1



#endif /* _ALPHA_CMPXCHG_H */

arch/alpha/include/asm/xchg.h

+2 −2
Original line number Diff line number Diff line 
#ifndef _ALPHA_ATOMIC_H

#ifndef _ALPHA_CMPXCHG_H

#error Do not include xchg.h directly!

#else

/*

 * xchg/xchg_local and cmpxchg/cmpxchg_local share the same code

 * except that local version do not have the expensive memory barrier.

 * So this file is included twice from asm/system.h.

 * So this file is included twice from asm/cmpxchg.h.

 */



/*