From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Sean MacLennan <smaclennan@pikatech.com>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>
Subject: Re: next branch update
Date: Thu, 11 Jun 2009 10:50:52 +1000 [thread overview]
Message-ID: <1244681452.5739.7.camel@pasglop> (raw)
In-Reply-To: <20090610175602.722bf68d@lappy.seanm.ca>
On Wed, 2009-06-10 at 17:56 -0400, Sean MacLennan wrote:
> What ever happened to this patch?
Dunno... It should have been in patchwork. I remember the patch
in fact and I intended to merge it... Can you re-submit with appropriate
cset comment, signed-off-by etc... ?
(Mistakes -do- happen, which is why we can be flexible with the rules,
btw, but heh, 33 new patches the day the merge window opens is a bit
over the top).
Cheers,
Ben.
> diff --git b/arch/powerpc/platforms/44x/warp.c
> a/arch/powerpc/platforms/44x/warp.c index c511880..7f3c1c7 100644
> --- b/arch/powerpc/platforms/44x/warp.c
> +++ a/arch/powerpc/platforms/44x/warp.c
> @@ -43,7 +43,13 @@ static int __init warp_probe(void)
> {
> unsigned long root = of_get_flat_dt_root();
>
> - return of_flat_dt_is_compatible(root, "pika,warp");
> + if (!of_flat_dt_is_compatible(root, "pika,warp"))
> + return 0;
> +
> + /* For __dma_alloc_coherent */
> + ISA_DMA_THRESHOLD = ~0L;
> +
> + return 1;
> }
>
> I don't see it in patchworks and I don't see it in Ben's or Josh's tree.
>
> Cheers,
> Sean
next prev parent reply other threads:[~2009-06-11 0:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-21 7:26 next branch update Benjamin Herrenschmidt
2009-05-21 8:06 ` Stephen Rothwell
2009-06-10 21:56 ` Sean MacLennan
2009-06-11 0:50 ` Benjamin Herrenschmidt [this message]
2009-06-11 1:09 ` Sean MacLennan
2009-06-11 1:30 ` Benjamin Herrenschmidt
-- strict thread matches above, loose matches on Subject: below --
2009-02-11 5:02 Benjamin Herrenschmidt
2008-12-02 15:11 Kumar Gala
2008-12-03 11:34 ` Paul Mackerras
2008-12-03 15:39 ` Kumar Gala
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=1244681452.5739.7.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=smaclennan@pikatech.com \
/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).