The patch titled Blackfin: SMP: convert to common asm-generic/atomic.h has been removed from the -mm tree. Its filename was blackfin-smp-convert-to-common-asm-generic-atomich.patch This patch was dropped because it was withdrawn The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: Blackfin: SMP: convert to common asm-generic/atomic.h From: Mike Frysinger <vapier@xxxxxxxxxx> Now that common code supports SMP systems, switch our SMP atomic logic over to it to avoid code duplication. Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx> Cc: Arun Sharma <asharma@xxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/blackfin/include/asm/atomic.h | 111 +++------------------------ 1 file changed, 13 insertions(+), 98 deletions(-) diff -puN arch/blackfin/include/asm/atomic.h~blackfin-smp-convert-to-common-asm-generic-atomich arch/blackfin/include/asm/atomic.h --- a/arch/blackfin/include/asm/atomic.h~blackfin-smp-convert-to-common-asm-generic-atomich +++ a/arch/blackfin/include/asm/atomic.h @@ -1,117 +1,32 @@ /* -Â * Copyright 2004-2009 Analog Devices Inc. -Â * -Â * Licensed under the GPL-2 or later. -Â */ + * Copyright 2004-2011 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ #ifndef __ARCH_BLACKFIN_ATOMIC__ #define __ARCH_BLACKFIN_ATOMIC__ -#ifndef CONFIG_SMP -# include <asm-generic/atomic.h> -#else - -#include <linux/types.h> -#include <asm/system.h> /* local_irq_XXX() */ +#ifdef CONFIG_SMP -/* - * Atomic operations that C can't guarantee us. Useful for - * resource counting etc.. - */ - -#define ATOMIC_INIT(i) { (i) } -#define atomic_set(v, i) (((v)->counter) = i) - -#define atomic_read(v) __raw_uncached_fetch_asm(&(v)->counter) +#include <linux/linkage.h> asmlinkage int __raw_uncached_fetch_asm(const volatile int *ptr); - asmlinkage int __raw_atomic_update_asm(volatile int *ptr, int value); - asmlinkage int __raw_atomic_clear_asm(volatile int *ptr, int value); - asmlinkage int __raw_atomic_set_asm(volatile int *ptr, int value); - asmlinkage int __raw_atomic_xor_asm(volatile int *ptr, int value); - asmlinkage int __raw_atomic_test_asm(const volatile int *ptr, int value); -static inline void atomic_add(int i, atomic_t *v) -{ - __raw_atomic_update_asm(&v->counter, i); -} - -static inline void atomic_sub(int i, atomic_t *v) -{ - __raw_atomic_update_asm(&v->counter, -i); -} - -static inline int atomic_add_return(int i, atomic_t *v) -{ - return __raw_atomic_update_asm(&v->counter, i); -} - -static inline int atomic_sub_return(int i, atomic_t *v) -{ - return __raw_atomic_update_asm(&v->counter, -i); -} - -static inline void atomic_inc(volatile atomic_t *v) -{ - __raw_atomic_update_asm(&v->counter, 1); -} - -static inline void atomic_dec(volatile atomic_t *v) -{ - __raw_atomic_update_asm(&v->counter, -1); -} - -static inline void atomic_clear_mask(int mask, atomic_t *v) -{ - __raw_atomic_clear_asm(&v->counter, mask); -} - -static inline void atomic_set_mask(int mask, atomic_t *v) -{ - __raw_atomic_set_asm(&v->counter, mask); -} - -/* Atomic operations are already serializing */ -#define smp_mb__before_atomic_dec() barrier() -#define smp_mb__after_atomic_dec() barrier() -#define smp_mb__before_atomic_inc() barrier() -#define smp_mb__after_atomic_inc() barrier() - -#define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0) -#define atomic_dec_return(v) atomic_sub_return(1,(v)) -#define atomic_inc_return(v) atomic_add_return(1,(v)) - -#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) -#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) - -#define __atomic_add_unless(v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ - c = old; \ - c; \ -}) - -/* - * atomic_inc_and_test - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 - * and returns true if the result is zero, or false for all - * other cases. - */ -#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0) - -#define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) -#define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) +#define atomic_read(v) __raw_uncached_fetch_asm(&(v)->counter) +#define atomic_add_return(i, v) __raw_atomic_update_asm(&(v)->counter, i) +#define atomic_sub_return(i, v) __raw_atomic_update_asm(&(v)->counter, -(i)) +#define atomic_clear_mask(m, v) __raw_atomic_clear_asm(&(v)->counter, m) +#define atomic_set_mask(m, v) __raw_atomic_set_asm(&(v)->counter, m) #endif +#include <asm-generic/atomic.h> + #endif _ Patches currently in -mm which might be from vapier@xxxxxxxxxx are mm-nommuc-fix-remap_pfn_range.patch linux-next.patch asm-generic-systemh-drop-useless-__kernel__.patch ptrace-unify-show_regs-prototype.patch ptrace-unify-show_regs-prototype-fix.patch atomic-use-linux-atomich.patch atomic-move-atomic_add_unless-to-generic-code.patch atomic-cleanup-asm-generic-atomich-inclusion.patch atomic-update-comments-in-atomich.patch asm-generic-atomich-simplify-inc-dec-test-helpers.patch asm-generic-atomich-fix-type-used-in-atomic_clear_mask.patch asm-generic-atomich-add-atomic_set_mask-helper.patch asm-generic-atomich-allow-smp-peeps-to-leverage-this.patch blackfin-smp-punt-unused-atomic_test_mask-helper.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html