From b4816afa3986704d1404fc48e931da5135820472 Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 28 Mar 2012 18:30:03 +0100 Subject: Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h to simplify disintegration of asm/system.h. Signed-off-by: David Howells Acked-by: Arnd Bergmann --- include/asm-generic/system.h | 70 -------------------------------------------- 1 file changed, 70 deletions(-) (limited to 'include/asm-generic/system.h') diff --git a/include/asm-generic/system.h b/include/asm-generic/system.h index f98f693383c4..54cd124ea9a4 100644 --- a/include/asm-generic/system.h +++ b/include/asm-generic/system.h @@ -17,7 +17,6 @@ #ifndef __ASSEMBLY__ #include -#include #include #include @@ -34,75 +33,6 @@ extern struct task_struct *__switch_to(struct task_struct *, #define arch_align_stack(x) (x) -/* - * we make sure local_irq_enable() doesn't cause priority inversion - */ - -/* This function doesn't exist, so you'll get a linker error - * if something tries to do an invalid xchg(). */ -extern void __xchg_called_with_bad_pointer(void); - -static inline -unsigned long __xchg(unsigned long x, volatile void *ptr, int size) -{ - unsigned long ret, flags; - - switch (size) { - case 1: -#ifdef __xchg_u8 - return __xchg_u8(x, ptr); -#else - local_irq_save(flags); - ret = *(volatile u8 *)ptr; - *(volatile u8 *)ptr = x; - local_irq_restore(flags); - return ret; -#endif /* __xchg_u8 */ - - case 2: -#ifdef __xchg_u16 - return __xchg_u16(x, ptr); -#else - local_irq_save(flags); - ret = *(volatile u16 *)ptr; - *(volatile u16 *)ptr = x; - local_irq_restore(flags); - return ret; -#endif /* __xchg_u16 */ - - case 4: -#ifdef __xchg_u32 - return __xchg_u32(x, ptr); -#else - local_irq_save(flags); - ret = *(volatile u32 *)ptr; - *(volatile u32 *)ptr = x; - local_irq_restore(flags); - return ret; -#endif /* __xchg_u32 */ - -#ifdef CONFIG_64BIT - case 8: -#ifdef __xchg_u64 - return __xchg_u64(x, ptr); -#else - local_irq_save(flags); - ret = *(volatile u64 *)ptr; - *(volatile u64 *)ptr = x; - local_irq_restore(flags); - return ret; -#endif /* __xchg_u64 */ -#endif /* CONFIG_64BIT */ - - default: - __xchg_called_with_bad_pointer(); - return x; - } -} - -#define xchg(ptr, x) \ - ((__typeof__(*(ptr))) __xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) - #endif /* !__ASSEMBLY__ */ #endif /* __ASM_GENERIC_SYSTEM_H */ -- cgit v1.2.3