From: Greg Ungerer <gerg@snapgear.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@vger.kernel.org, gerg@uclinux.org
Subject: Re: [PATCH] m68k/m68knommu: merge MMU and non-MMU atomic.h
Date: Wed, 8 Sep 2010 10:25:08 +1000 [thread overview]
Message-ID: <4C86D7E4.5040907@snapgear.com> (raw)
In-Reply-To: <AANLkTikp0W54UDhrtxEiWMtUJ8adQMt1tMd3ckRrE=55@mail.gmail.com>
Geert Uytterhoeven wrote:
> On Tue, Sep 7, 2010 at 07:49, Greg Ungerer <gerg@snapgear.com> wrote:
>> m68k/m68knommu: merge MMU and non-MMU atomic.h
>>
>> The only difference between the MMU and non-MMU versions of atomic.h
>> is in the extra support ColdFire family processors. So merge this into
>> the MMU version of atomic.h.
>>
>> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
>> ---
>> arch/m68k/include/asm/{atomic_mm.h => atomic.h} | 16 ++-
>> arch/m68k/include/asm/atomic_no.h | 155 -----------------------
>> 2 files changed, 13 insertions(+), 158 deletions(-)
>> rename arch/m68k/include/asm/{atomic_mm.h => atomic.h} (92%)
>> delete mode 100644 arch/m68k/include/asm/atomic_no.h
>>
>> diff --git a/arch/m68k/include/asm/atomic_mm.h b/arch/m68k/include/asm/atomic.h
>> similarity index 92%
>> rename from arch/m68k/include/asm/atomic_mm.h
>> rename to arch/m68k/include/asm/atomic.h
>> index 6a223b3..3db3c93 100644
>> --- a/arch/m68k/include/asm/atomic_mm.h
>> +++ b/arch/m68k/include/asm/atomic.h
>
> arch/m68k/include/asm/atomic.h had a line
>
> | #include <asm-generic/atomic64.h>
>
> before, which is now gone? This break lib/atomic64.c.
Oops. Missed that when I copied over atomic_mm.h. I'll fix this,
and rename DI and send an updated patch.
Thanks
Greg
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
prev parent reply other threads:[~2010-09-08 0:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-07 5:49 [PATCH] m68k/m68knommu: merge MMU and non-MMU atomic.h Greg Ungerer
2010-09-07 7:32 ` Andreas Schwab
2010-09-07 9:53 ` Greg Ungerer
2010-09-07 20:42 ` Geert Uytterhoeven
2010-09-08 0:25 ` Greg Ungerer [this message]
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=4C86D7E4.5040907@snapgear.com \
--to=gerg@snapgear.com \
--cc=geert@linux-m68k.org \
--cc=gerg@uclinux.org \
--cc=linux-m68k@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.