From: David Howells <dhowells@redhat.com>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: dhowells@redhat.com, torvalds@linux-foundation.org,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Bob Liu <lliubbo@gmail.com>, Mike Frysinger <vapier@gentoo.org>
Subject: Re: [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout
Date: Mon, 02 Apr 2012 06:49:15 +0100 [thread overview]
Message-ID: <30114.1333345755@redhat.com> (raw)
In-Reply-To: <1333312727-11428-6-git-send-email-paul.gortmaker@windriver.com>
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>
next prev parent reply other threads:[~2012-04-02 5:49 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-01 20:38 [PATCH 00/11] Fix up more asm/system.h fallout Paul Gortmaker
2012-04-01 20:38 ` [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split Paul Gortmaker
2012-04-01 20:38 ` [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout Paul Gortmaker
2012-04-02 21:16 ` David Brown
2012-04-01 20:38 ` [PATCH 03/11] avr32: fix nop compile fails from system.h split up Paul Gortmaker
2012-04-01 20:38 ` [PATCH 04/11] avr32: fix build failures from mis-naming of atmel_nand.h Paul Gortmaker
2012-04-01 20:38 ` [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout Paul Gortmaker
2012-04-01 20:38 ` [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split Paul Gortmaker
2012-04-01 20:38 ` [PATCH 07/11] sh: fix several build failures from system.h fallout Paul Gortmaker
2012-04-02 1:00 ` Paul Mundt
2012-04-02 18:15 ` Paul Gortmaker
2012-04-02 23:57 ` Stephen Rothwell
2012-04-05 2:46 ` Paul Gortmaker
2012-04-05 2:49 ` Paul Gortmaker
2012-04-05 15:15 ` Paul Mundt
2012-04-06 6:40 ` linux-next: sh tree (Was:Re: [PATCH 07/11] sh: fix several build failures from system.h fallout) Stephen Rothwell
2012-04-01 20:38 ` [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL Paul Gortmaker
2012-04-01 20:38 ` [PATCH 09/11] firewire: restore the device.h include in linux/firewire.h Paul Gortmaker
2012-04-01 20:38 ` [PATCH 10/11] tile: fix multiple build failures from system.h dismantle Paul Gortmaker
2012-04-01 20:38 ` [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h Paul Gortmaker
2012-04-06 6:28 ` Jonas Bonn
2012-04-02 0:03 ` [PATCH 00/11] Fix up more asm/system.h fallout Stephen Rothwell
2012-04-02 5:30 ` David Howells
2012-04-02 5:43 ` [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL David Howells
2012-04-02 5:44 ` [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout David Howells
2012-04-02 5:45 ` [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split David Howells
2012-04-02 5:47 ` [PATCH 03/11] avr32: fix nop compile fails from system.h split up David Howells
2012-04-02 19:11 ` Paul Gortmaker
2012-04-02 5:49 ` David Howells [this message]
2012-04-02 5:50 ` [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split David Howells
2012-04-02 5:52 ` [PATCH 10/11] tile: fix multiple build failures from system.h dismantle David Howells
2012-04-02 15:59 ` Chris Metcalf
2012-04-02 18:05 ` Paul Gortmaker
2012-04-02 5:53 ` [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30114.1333345755@redhat.com \
--to=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lliubbo@gmail.com \
--cc=paul.gortmaker@windriver.com \
--cc=torvalds@linux-foundation.org \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).