lkml.org 
[lkml]   [2008]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] 2.6.26-rc: x86: pci-dma.c: use __GFP_NO_OOM instead of __GFP_NORETRY

* Miquel van Smoorenburg <mikevs@xs4all.net> wrote:

> Okay, so how about this then ?
>
> --- linux-2.6.26-rc4.orig/arch/x86/kernel/pci-dma.c 2008-05-26 20:08:11.000000000 +0200
> +++ linux-2.6.26-rc4/arch/x86/kernel/pci-dma.c 2008-05-28 10:27:41.000000000 +0200
> @@ -397,9 +397,6 @@
> if (dev->dma_mask == NULL)
> return NULL;
>
> - /* Don't invoke OOM killer */
> - gfp |= __GFP_NORETRY;
> -
> #ifdef CONFIG_X86_64
> /* Why <=? Even when the mask is smaller than 4GB it is often
> larger than 16MB and in this case we have a chance of
> @@ -410,7 +407,9 @@
> #endif
>
> again:
> - page = dma_alloc_pages(dev, gfp, get_order(size));
> + /* Don't invoke OOM killer or retry in lower 16MB DMA zone */
> + page = dma_alloc_pages(dev,
> + (gfp & GFP_DMA) ? gfp | __GFP_NORETRY : gfp, get_order(size));
> if (page == NULL)
> return NULL;

applied to tip/pci-for-jesse for more testing. Thanks,

Ingo


\
 
 \ /
  Last update: 2008-06-02 12:19    [from the cache]
©2003-2011 Jasper Spaans