]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
m68k: include asm/cmpxchg.h in our m68k atomic.h
authorGreg Ungerer <gerg@uclinux.org>
Fri, 30 Mar 2012 05:52:09 +0000 (15:52 +1000)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 1 Apr 2012 20:57:49 +0000 (22:57 +0200)
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>
arch/m68k/include/asm/atomic.h

index 336e6173794f3a2c2b720d4b3ce87e8ddca7d67a..f4e32de263a7cefe98f3c9a5f7b2dc4071c12d00 100644 (file)
@@ -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