diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-01 22:38:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 23:41:25 +0200 |
commit | 1512cdc3572dac34a1809764f9a646cde7e82407 (patch) | |
tree | abd8318fb7a49bb0a04b338197eeecaa373ac5ed /arch/parisc/include/asm/atomic.h | |
parent | avr32: fix build failures from mis-naming of atmel_nand.h (diff) | |
download | linux-1512cdc3572dac34a1809764f9a646cde7e82407.tar.xz linux-1512cdc3572dac34a1809764f9a646cde7e82407.zip |
blackfin: fix cmpxchg build fails from system.h fallout
Commit 3bed8d67469c ("Disintegrate asm/system.h for Blackfin [ver #2]")
introduced arch/blackfin/include/asm/cmpxchg.h but has it also including
the asm-generic one which causes this:
CC arch/blackfin/kernel/asm-offsets.s
In file included from arch/blackfin/include/asm/cmpxchg.h:125:0,
from arch/blackfin/include/asm/atomic.h:10,
from include/linux/atomic.h:4,
from include/linux/spinlock.h:384,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/timex.h:56,
from include/linux/sched.h:57,
from arch/blackfin/kernel/asm-offsets.c:10:
include/asm-generic/cmpxchg.h:24:15: error: redefinition of '__xchg'
arch/blackfin/include/asm/cmpxchg.h:82:29: note: previous definition of '__xchg' was here
make[2]: *** [arch/blackfin/kernel/asm-offsets.s] Error 1
It really only needs two simple defines from asm-generic, so just use
those instead.
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/parisc/include/asm/atomic.h')
0 files changed, 0 insertions, 0 deletions