[IA64-SGI] sn_dma_alloc_coherent should use gfp flags (dc641613) · Commits · 戴 / test

Takashi helped us track down a bad page state bug we thought was coming from alsa. It turns out we weren't paying attention to the gfp flags that were passed in to sn_dma_alloc_coherent(). From: Takashi Iwai <tiwai@suse.de> Signed-off-by:

Greg Edwards <edwardsg@sgi.com> Signed-off-by:

Mark Maule <maule@sgi.com> Signed-off-by:

Jes Sorensen <jes@sgi.com>

arch/ia64/sn/pci/pci_dma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -90,14 +90,14 @@ void sn_dma_alloc_coherent(struct device dev, size_t size,
		*/
		node = pcibus_to_node(pdev->bus);
		if (likely(node >=0)) {
		struct page *p = alloc_pages_node(node, GFP_ATOMIC, get_order(size));
		struct page *p = alloc_pages_node(node, flags, get_order(size));

		if (likely(p))
		cpuaddr = page_address(p);
		else
		return NULL;
		} else
		cpuaddr = (void *)__get_free_pages(GFP_ATOMIC, get_order(size));
		cpuaddr = (void *)__get_free_pages(flags, get_order(size));

		if (unlikely(!cpuaddr))
		return NULL;

Admin message