lkml.org 
[lkml]   [2012]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout
Date
Paul Gortmaker <paul.gortmaker@windriver.com> wrote:

> Commit 3bed8d67469cc7129b0babc0211c32fa68408ce0
>
> "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
> In file included from arch/blackfin/include/asm/atomic.h:10:0,
> 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:
> arch/blackfin/include/asm/cmpxchg.h:129:0: warning: "xchg" redefined [enabled by default]
> include/asm-generic/cmpxchg.h:81:0: note: this is the location of the previous definition
> 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>


\
 
 \ /
  Last update: 2012-04-02 07:51    [from the cache]
©2003-2011 Jasper Spaans