From: David Miller <davem@davemloft.net>
To: ben@decadent.org.uk
Cc: ionut@badula.org, akinobu.mita@gmail.com,
fujita.tomonori@lab.ntt.co.jp, netdev@vger.kernel.org
Subject: Re: [PATCH net-2.6] starfire: Fix dma_addr_t size test for MIPS
Date: Fri, 31 Dec 2010 12:34:43 -0800 (PST) [thread overview]
Message-ID: <20101231.123443.35039907.davem@davemloft.net> (raw)
In-Reply-To: <1293632777.2928.127.camel@localhost>
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 29 Dec 2010 14:26:17 +0000
> Commit 56543af "starfire: use BUILD_BUG_ON for netdrv_addr_t" revealed
> that the preprocessor condition used to find the size of dma_addr_t
> yielded the wrong result for some architectures and configurations.
> This was kluged for 64-bit PowerPC in commit 3e502e6 by adding yet
> another case to the condition. However, 64-bit MIPS configurations
> are not detected reliably either.
>
> This should be fixed by using CONFIG_ARCH_DMA_ADDR_T_64BIT, but that
> isn't yet defined everywhere it should be.
>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Applied to net-2.6, thanks.
> The MIPS conditions are changed to match those Tomonori specified for
> CONFIG_ARCH_DMA_ADDR_T_64BIT.
>
> Please change the condition to defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) in
> net-next-2.6. I leave it up to you to decide when to make that change.
> (Simply applying a patch to net-next-2.6 now will result in a later
> merge conflict and breakage for those two architectures.)
The thing to do here is to make this change after the next merge
window takes in Fujita's patch definiting ARCH_DMA_ADDR_T_64BIT from
the -mm set.
prev parent reply other threads:[~2010-12-31 20:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-29 14:26 [PATCH net-2.6] starfire: Fix dma_addr_t size test for MIPS Ben Hutchings
2010-12-31 20:34 ` David Miller [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=20101231.123443.35039907.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=akinobu.mita@gmail.com \
--cc=ben@decadent.org.uk \
--cc=fujita.tomonori@lab.ntt.co.jp \
--cc=ionut@badula.org \
--cc=netdev@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 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).