diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 14:41:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 14:41:43 -0700 |
| commit | 95694129b43165911dc4e8a972f0d39ad98d86be (patch) | |
| tree | a7faf4b70c85b457f684cbc1033ac5b79457c2e9 /arch/blackfin/include/asm/cmpxchg.h | |
| parent | b1a808ff436343956a6ae63178ea1810c5e5a3a1 (diff) | |
| parent | 80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8 (diff) | |
| download | talos-op-linux-95694129b43165911dc4e8a972f0d39ad98d86be.tar.gz talos-op-linux-95694129b43165911dc4e8a972f0d39ad98d86be.zip | |
Merge branch 'paul' (Fixups from Paul Gortmaker)
This merges some of the fixes from Paul Gortmaker for the header file
cleanup fallout.
Some of the patches are going through arch maintainer trees, and David
Howells suggested another be done differently, but this at least fixes a
few cases.
* emailed from Paul Gortmaker <paul.gortmaker@windriver.com>:
asm-generic: add linux/types.h to cmpxchg.h
firewire: restore the device.h include in linux/firewire.h
frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL
parisc: fix missing cmpxchg file error from system.h split
blackfin: fix cmpxchg build fails from system.h fallout
avr32: fix build failures from mis-naming of atmel_nand.h
ARM: mach-msm: fix compile fail from system.h fallout
irq_work: fix compile failure on MIPS from system.h split
Diffstat (limited to 'arch/blackfin/include/asm/cmpxchg.h')
| -rw-r--r-- | arch/blackfin/include/asm/cmpxchg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/cmpxchg.h b/arch/blackfin/include/asm/cmpxchg.h index ba2484f4cb2a..c05868cc61c1 100644 --- a/arch/blackfin/include/asm/cmpxchg.h +++ b/arch/blackfin/include/asm/cmpxchg.h @@ -122,7 +122,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, (unsigned long)(n), sizeof(*(ptr)))) #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) -#include <asm-generic/cmpxchg.h> +#define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) +#define cmpxchg64(ptr, o, n) cmpxchg64_local((ptr), (o), (n)) #endif /* !CONFIG_SMP */ |
