summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-03-30 15:52:09 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2012-04-01 22:57:49 +0200
commit7224c0d1045327d637dab2c90777b6d5ec6d6804 (patch)
treeef39bbd027772ebec21435f762815d783ba0e3da /arch/m68k
parentdd775ae2549217d3ae09363e3edb305d0fa19928 (diff)
downloadlinux-7224c0d1045327d637dab2c90777b6d5ec6d6804.tar.gz
linux-7224c0d1045327d637dab2c90777b6d5ec6d6804.tar.bz2
linux-7224c0d1045327d637dab2c90777b6d5ec6d6804.zip
m68k: include asm/cmpxchg.h in our m68k atomic.h
After commit 9ffc93f203c18a70623f21950f1dd473c9ec48cd ("Remove all CC init/main.o In file included from include/linux/mm.h:15:0, from include/linux/ring_buffer.h:5, from include/linux/ftrace_event.h:4, from include/trace/syscall.h:6, from include/linux/syscalls.h:78, from init/main.c:16: include/linux/debug_locks.h: In function ‘__debug_locks_off’: include/linux/debug_locks.h:16:2: error: implicit declaration of function ‘xchg’ There is no indirect inclusions of the new asm/cmpxchg.h for m68k here. Looking at most other architectures they include asm/cmpxchg.h in their asm/atomic.h. M68k currently does not do this. Including this in atomic.h fixes all m68k build problems. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/atomic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h
index 336e6173794f..f4e32de263a7 100644
--- a/arch/m68k/include/asm/atomic.h
+++ b/arch/m68k/include/asm/atomic.h
@@ -3,6 +3,7 @@
#include <linux/types.h>
#include <linux/irqflags.h>
+#include <asm/cmpxchg.h>
/*
* Atomic operations that C can't guarantee us. Useful for