sh: Use __GFP_ZERO for dma_generic_alloc_coherent().
authorAndrew Murray <amurray@mpc-data.co.uk>
Wed, 4 Aug 2010 07:38:35 +0000 (16:38 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 4 Aug 2010 07:38:35 +0000 (16:38 +0900)
This follows the x86 change off of memset() and on to an unconditional
__GFP_ZERO for wrapping in to optimized page clearing by way of
clear_highpage().

Signed-off-by: Andrew Murray <amurray@mpc-data.co.uk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/mm/consistent.c

index c86a085..0387932 100644 (file)
@@ -38,11 +38,12 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
        void *ret, *ret_nocache;
        int order = get_order(size);
 
+       gfp |= __GFP_ZERO;
+
        ret = (void *)__get_free_pages(gfp, order);
        if (!ret)
                return NULL;
 
-       memset(ret, 0, size);
        /*
         * Pages from the page allocator may have data present in
         * cache. So flush the cache before using uncached memory.