Commit 7907ea42 authored by Daniel Hellstrom's avatar Daniel Hellstrom Committed by Greg Kroah-Hartman

sparc32: dma_alloc_coherent must honour gfp flags

[ Upstream commit d1105287 ]

dma_zalloc_coherent() calls dma_alloc_coherent(__GFP_ZERO)
but the sparc32 implementations sbus_alloc_coherent() and
pci32_alloc_coherent() doesn't take the gfp flags into
account.

Tested on the SPARC32/LEON GRETH Ethernet driver which fails
due to dma_alloc_coherent(__GFP_ZERO) returns non zeroed
pages.
Signed-off-by: default avatarDaniel Hellstrom <daniel@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7f7dcad
...@@ -278,7 +278,8 @@ static void *sbus_alloc_coherent(struct device *dev, size_t len, ...@@ -278,7 +278,8 @@ static void *sbus_alloc_coherent(struct device *dev, size_t len,
} }
order = get_order(len_total); order = get_order(len_total);
if ((va = __get_free_pages(GFP_KERNEL|__GFP_COMP, order)) == 0) va = __get_free_pages(gfp, order);
if (va == 0)
goto err_nopages; goto err_nopages;
if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL)
...@@ -443,7 +444,7 @@ static void *pci32_alloc_coherent(struct device *dev, size_t len, ...@@ -443,7 +444,7 @@ static void *pci32_alloc_coherent(struct device *dev, size_t len,
} }
order = get_order(len_total); order = get_order(len_total);
va = (void *) __get_free_pages(GFP_KERNEL, order); va = (void *) __get_free_pages(gfp, order);
if (va == NULL) { if (va == NULL) {
printk("pci_alloc_consistent: no %ld pages\n", len_total>>PAGE_SHIFT); printk("pci_alloc_consistent: no %ld pages\n", len_total>>PAGE_SHIFT);
goto err_nopages; goto err_nopages;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment