Patchwork next branch update

login
register
mail settings
Submitter Sean MacLennan
Date June 10, 2009, 9:56 p.m.
Message ID <20090610175602.722bf68d@lappy.seanm.ca>
Download mbox | patch
Permalink /patch/28530/
State Superseded
Headers show

Comments

Sean MacLennan - June 10, 2009, 9:56 p.m.
What ever happened to this patch?


Cheers,
   Sean
Benjamin Herrenschmidt - June 11, 2009, 12:50 a.m.
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

Patch

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.