lkml.org 
[lkml]   [2014]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 11/81] x86: dma-mapping: fix GFP_ATOMIC macro usage
    Date
    3.8.13.20 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marek Szyprowski <m.szyprowski@samsung.com>

    commit c091c71ad2218fc50a07b3d1dab85783f3b77efd upstream.

    GFP_ATOMIC is not a single gfp flag, but a macro which expands to the other
    flags, where meaningful is the LACK of __GFP_WAIT flag. To check if caller
    wants to perform an atomic allocation, the code must test for a lack of the
    __GFP_WAIT flag. This patch fixes the issue introduced in v3.5-rc1.

    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    arch/x86/kernel/pci-dma.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
    index 872079a..f7d0672 100644
    --- a/arch/x86/kernel/pci-dma.c
    +++ b/arch/x86/kernel/pci-dma.c
    @@ -100,8 +100,10 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
    flag |= __GFP_ZERO;
    again:
    page = NULL;
    - if (!(flag & GFP_ATOMIC))
    + /* CMA can be used only in the context which permits sleeping */
    + if (flag & __GFP_WAIT)
    page = dma_alloc_from_contiguous(dev, count, get_order(size));
    + /* fallback */
    if (!page)
    page = alloc_pages_node(dev_to_node(dev), flag, get_order(size));
    if (!page)
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-03-25 19:41    [W:14.117 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site