Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1105287 authored by Daniel Hellstrom's avatar Daniel Hellstrom Committed by David S. Miller
Browse files

sparc32: dma_alloc_coherent must honour gfp flags 



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>
parent b84ca92e

arch/sparc/kernel/ioport.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -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, 
	}

	}





	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;