Thread (6 messages) flat view 6 messages, 3 authors, 2009-06-11

Re: next branch update

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2009-06-11 00:50:59

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.
quoted hunk ↗ jump to hunk
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help