[PATCH] m68k: include asm/cmpxchg.h in our m68k atomic.h

[PATCH] m68k: include asm/cmpxchg.h in our m68k atomic.h

[gerg]

From: Greg Ungerer <gerg@uclinux.org>

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>
---
 arch/m68k/include/asm/atomic.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h
index 336e617..f4e32de 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
-- 
1.7.0.4

Re: [PATCH] m68k: include asm/cmpxchg.h in our m68k atomic.h

[David Howells]

<gerg@uclinux.org> wrote:

> From: Greg Ungerer <gerg@uclinux.org>
> 
> 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>

Re: [PATCH] m68k: include asm/cmpxchg.h in our m68k atomic.h

[Geert Uytterhoeven]

On Sat, Mar 31, 2012 at 21:28, David Howells <dhowells@redhat.com> wrote:
> <gerg@uclinux.org> wrote:
>
>> From: Greg Ungerer <gerg@uclinux.org>
>>
>> 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>

Thanks! I hope to create for-3.4 and for-3.5 branches tomorrow.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds