Messages in this thread | | | Date | Tue, 21 Jun 2011 16:05:28 -0700 | From | Andrew Morton <> | Subject | Re: [PATCH 6/6] Blackfin: SMP: convert to common asm-generic/atomic.h |
| |
On Fri, 17 Jun 2011 17:53:34 -0400 Mike Frysinger <vapier@gentoo.org> wrote:
> Now that common code supports SMP systems, switch our SMP atomic logic > over to it to avoid code duplication.
There were some rejects on this one, I think because lines 2, 3 and 4 had non-ascii crap in them and because your patch was expecting inclusions of asm-generic/atomic-long.h and asm-generic/atomic64.h, which were removed.
I ended up with the below but I don't know if it works.
/* * Copyright 2004-2011 Analog Devices Inc. _* _* Licensed under the GPL-2 or later. _*/
#ifndef __ARCH_BLACKFIN_ATOMIC__ #define __ARCH_BLACKFIN_ATOMIC__
#ifdef CONFIG_SMP
#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);
#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
| |