Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / kernel / dma / virt.c

diff --git a/kernel/dma/virt.c b/kernel/dma/virt.c
index 631ddec4b60a8b94576b1c3a36db71a818bff5d8..ebe128833af7b55cc132a090e45c2609fb59e431 100644 (file)
--- a/kernel/dma/virt.c
+++ b/kernel/dma/virt.c
@@ -13,7 +13,7 @@ static void *dma_virt_alloc(struct device *dev, size_t size,
 {
        void *ret;
 
-       ret = (void *)__get_free_pages(gfp, get_order(size));
+       ret = (void *)__get_free_pages(gfp | __GFP_ZERO, get_order(size));
        if (ret)
                *dma_handle = (uintptr_t)ret;
        return ret;