Re: [patch 09/12] Mask off GFP flags before swiotlb_alloc_coherent

[Andi Kleen]

On Saturday 28 January 2006 03:21, Greg KH wrote:
> 2.6.15.2 -stable review patch.  If anyone has any objections, please let 
> us know.

That patch isn't in mainline yet and shouldn't be merged to stable before
that happens.

-Andi

> 
> ------------------
> 
> From: Andi Kleen <ak@xxxxxx>
> 
> Mask off GFP flags before swiotlb_alloc_coherent
> 
> Signed-off-by: Andi Kleen <ak@xxxxxxx>
> Signed-off-by: Chris Wright <chris@xxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
> ---
>  arch/x86_64/kernel/pci-gart.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-2.6.15.1.orig/arch/x86_64/kernel/pci-gart.c
> +++ linux-2.6.15.1/arch/x86_64/kernel/pci-gart.c
> @@ -244,6 +244,7 @@ dma_alloc_coherent(struct device *dev, s
>  					   get_order(size));
>  
>  				if (swiotlb) {
> +					gfp &= ~(GFP_DMA32|GFP_DMA);
>  					return
>  					swiotlb_alloc_coherent(dev, size,
>  							       dma_handle,
> 
> --
> 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/