Commit 668ce0ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'systemh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 

Pull system.h fixups for less common arch's from Paul Gortmaker:
 "Here is what is hopefully the last of the system.h related fixups.

  The fixes for Alpha and ia64 are code relocations consistent with what
  was done for the more mainstream architectures.  Note that the
  diffstat lines removed vs lines added are not the same since I've
  fixed some of the whitespace issues in the relocated code blocks.
  However they are functionally the same.  Compile tested locally, plus
  these two have been in linux-next for a while.

  There is also a trivial one line system.h related fix for the Tilera
  arch from Chris Metcalf to fix an implict include.."

* 'systemh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  irq_work: fix compile failure on tile from missing include
  ia64: populate the cmpxchg header with appropriate code
  alpha: fix build failures from system.h dismemberment
parents a1c0cad3 ef1f0982

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.

 */



/*

arch/ia64/include/asm/cmpxchg.h

+147 −1
Original line number Diff line number Diff line 
#include <asm/intrinsics.h>
 
#ifndef _ASM_IA64_CMPXCHG_H

#define _ASM_IA64_CMPXCHG_H



/*

 * Compare/Exchange, forked from asm/intrinsics.h

 * which was:

 *

 *	Copyright (C) 2002-2003 Hewlett-Packard Co

 *	David Mosberger-Tang <davidm@hpl.hp.com>

 */



#ifndef __ASSEMBLY__



#include <linux/types.h>

/* include compiler specific intrinsics */

#include <asm/ia64regs.h>

#ifdef __INTEL_COMPILER

# include <asm/intel_intrin.h>

#else

# include <asm/gcc_intrin.h>

#endif



/*

 * This function doesn't exist, so you'll get a linker error if

 * something tries to do an invalid xchg().

 */

extern void ia64_xchg_called_with_bad_pointer(void);



#define __xchg(x, ptr, size)						\

({									\

	unsigned long __xchg_result;					\

									\

	switch (size) {							\

	case 1:								\

		__xchg_result = ia64_xchg1((__u8 *)ptr, x);		\

		break;							\

									\

	case 2:								\

		__xchg_result = ia64_xchg2((__u16 *)ptr, x);		\

		break;							\

									\

	case 4:								\

		__xchg_result = ia64_xchg4((__u32 *)ptr, x);		\

		break;							\

									\

	case 8:								\

		__xchg_result = ia64_xchg8((__u64 *)ptr, x);		\

		break;							\

	default:							\

		ia64_xchg_called_with_bad_pointer();			\

	}								\

	__xchg_result;							\

})



#define xchg(ptr, x)							\

((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr))))



/*

 * Atomic compare and exchange.  Compare OLD with MEM, if identical,

 * store NEW in MEM.  Return the initial value in MEM.  Success is

 * indicated by comparing RETURN with OLD.

 */



#define __HAVE_ARCH_CMPXCHG 1



/*

 * This function doesn't exist, so you'll get a linker error

 * if something tries to do an invalid cmpxchg().

 */

extern long ia64_cmpxchg_called_with_bad_pointer(void);



#define ia64_cmpxchg(sem, ptr, old, new, size)				\

({									\

	__u64 _o_, _r_;							\

									\

	switch (size) {							\

	case 1:								\

		_o_ = (__u8) (long) (old);				\

		break;							\

	case 2:								\

		_o_ = (__u16) (long) (old);				\

		break;							\

	case 4:								\

		_o_ = (__u32) (long) (old);				\

		break;							\

	case 8:								\

		_o_ = (__u64) (long) (old);				\

		break;							\

	default:							\

		break;							\

	}								\

	switch (size) {							\

	case 1:								\

		_r_ = ia64_cmpxchg1_##sem((__u8 *) ptr, new, _o_);	\

		break;							\

									\

	case 2:								\

		_r_ = ia64_cmpxchg2_##sem((__u16 *) ptr, new, _o_);	\

		break;							\

									\

	case 4:								\

		_r_ = ia64_cmpxchg4_##sem((__u32 *) ptr, new, _o_);	\

		break;							\

									\

	case 8:								\

		_r_ = ia64_cmpxchg8_##sem((__u64 *) ptr, new, _o_);	\

		break;							\

									\

	default:							\

		_r_ = ia64_cmpxchg_called_with_bad_pointer();		\

		break;							\

	}								\

	(__typeof__(old)) _r_;						\

})



#define cmpxchg_acq(ptr, o, n)	\

	ia64_cmpxchg(acq, (ptr), (o), (n), sizeof(*(ptr)))

#define cmpxchg_rel(ptr, o, n)	\

	ia64_cmpxchg(rel, (ptr), (o), (n), sizeof(*(ptr)))



/* for compatibility with other platforms: */

#define cmpxchg(ptr, o, n)	cmpxchg_acq((ptr), (o), (n))

#define cmpxchg64(ptr, o, n)	cmpxchg_acq((ptr), (o), (n))



#define cmpxchg_local		cmpxchg

#define cmpxchg64_local		cmpxchg64



#ifdef CONFIG_IA64_DEBUG_CMPXCHG

# define CMPXCHG_BUGCHECK_DECL	int _cmpxchg_bugcheck_count = 128;

# define CMPXCHG_BUGCHECK(v)						\

do {									\

	if (_cmpxchg_bugcheck_count-- <= 0) {				\

		void *ip;						\

		extern int printk(const char *fmt, ...);		\

		ip = (void *) ia64_getreg(_IA64_REG_IP);		\

		printk("CMPXCHG_BUGCHECK: stuck at %p on word %p\n", ip, (v));\

		break;							\

	}								\

} while (0)

#else /* !CONFIG_IA64_DEBUG_CMPXCHG */

# define CMPXCHG_BUGCHECK_DECL

# define CMPXCHG_BUGCHECK(v)

#endif /* !CONFIG_IA64_DEBUG_CMPXCHG */



#endif /* !__ASSEMBLY__ */



#endif /* _ASM_IA64_CMPXCHG_H */

arch/ia64/include/asm/intrinsics.h

+1 −113
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#else

# include <asm/gcc_intrin.h>

#endif

#include <asm/cmpxchg.h>



#define ia64_native_get_psr_i()	(ia64_native_getreg(_IA64_REG_PSR) & IA64_PSR_I)
@@ -81,119 +82,6 @@ extern unsigned long __bad_increment_for_ia64_fetch_and_add (void); 


#define ia64_fetch_and_add(i,v)	(ia64_fetchadd(i, v, rel) + (i)) /* return new value */



/*

 * This function doesn't exist, so you'll get a linker error if

 * something tries to do an invalid xchg().

 */

extern void ia64_xchg_called_with_bad_pointer (void);



#define __xchg(x,ptr,size)						\

({									\

	unsigned long __xchg_result;					\

									\

	switch (size) {							\

	      case 1:							\

		__xchg_result = ia64_xchg1((__u8 *)ptr, x);		\

		break;							\

									\

	      case 2:							\

		__xchg_result = ia64_xchg2((__u16 *)ptr, x);		\

		break;							\

									\

	      case 4:							\

		__xchg_result = ia64_xchg4((__u32 *)ptr, x);		\

		break;							\

									\

	      case 8:							\

		__xchg_result = ia64_xchg8((__u64 *)ptr, x);		\

		break;							\

	      default:							\

		ia64_xchg_called_with_bad_pointer();			\

	}								\

	__xchg_result;							\

})



#define xchg(ptr,x)							     \

  ((__typeof__(*(ptr))) __xchg ((unsigned long) (x), (ptr), sizeof(*(ptr))))



/*

 * Atomic compare and exchange.  Compare OLD with MEM, if identical,

 * store NEW in MEM.  Return the initial value in MEM.  Success is

 * indicated by comparing RETURN with OLD.

 */



#define __HAVE_ARCH_CMPXCHG 1



/*

 * This function doesn't exist, so you'll get a linker error

 * if something tries to do an invalid cmpxchg().

 */

extern long ia64_cmpxchg_called_with_bad_pointer (void);



#define ia64_cmpxchg(sem,ptr,old,new,size)						\

({											\

	__u64 _o_, _r_;									\

											\

	switch (size) {									\

	      case 1: _o_ = (__u8 ) (long) (old); break;				\

	      case 2: _o_ = (__u16) (long) (old); break;				\

	      case 4: _o_ = (__u32) (long) (old); break;				\

	      case 8: _o_ = (__u64) (long) (old); break;				\

	      default: break;								\

	}										\

	switch (size) {									\

	      case 1:									\

	      	_r_ = ia64_cmpxchg1_##sem((__u8 *) ptr, new, _o_);			\

		break;									\

											\

	      case 2:									\

	       _r_ = ia64_cmpxchg2_##sem((__u16 *) ptr, new, _o_);			\

		break;									\

											\

	      case 4:									\

	      	_r_ = ia64_cmpxchg4_##sem((__u32 *) ptr, new, _o_);			\

		break;									\

											\

	      case 8:									\

		_r_ = ia64_cmpxchg8_##sem((__u64 *) ptr, new, _o_);			\

		break;									\

											\

	      default:									\

		_r_ = ia64_cmpxchg_called_with_bad_pointer();				\

		break;									\

	}										\

	(__typeof__(old)) _r_;								\

})



#define cmpxchg_acq(ptr, o, n)	\

	ia64_cmpxchg(acq, (ptr), (o), (n), sizeof(*(ptr)))

#define cmpxchg_rel(ptr, o, n)	\

	ia64_cmpxchg(rel, (ptr), (o), (n), sizeof(*(ptr)))



/* for compatibility with other platforms: */

#define cmpxchg(ptr, o, n)	cmpxchg_acq((ptr), (o), (n))

#define cmpxchg64(ptr, o, n)	cmpxchg_acq((ptr), (o), (n))



#define cmpxchg_local		cmpxchg

#define cmpxchg64_local		cmpxchg64



#ifdef CONFIG_IA64_DEBUG_CMPXCHG

# define CMPXCHG_BUGCHECK_DECL	int _cmpxchg_bugcheck_count = 128;

# define CMPXCHG_BUGCHECK(v)							\

  do {										\

	if (_cmpxchg_bugcheck_count-- <= 0) {					\

		void *ip;							\

		extern int printk(const char *fmt, ...);			\

		ip = (void *) ia64_getreg(_IA64_REG_IP);			\

		printk("CMPXCHG_BUGCHECK: stuck at %p on word %p\n", ip, (v));	\

		break;								\

	}									\

  } while (0)

#else /* !CONFIG_IA64_DEBUG_CMPXCHG */

# define CMPXCHG_BUGCHECK_DECL

# define CMPXCHG_BUGCHECK(v)

#endif /* !CONFIG_IA64_DEBUG_CMPXCHG */



#endif



#ifdef __KERNEL__

CRA Git | Maintained and supported by SUSTech CRA and CCSE