x86/PCI: Adjust GFP mask handling for coherent allocations
commiteb647138acefc897c0eb6eddd5d3650966dfe627
authorJan Beulich <JBeulich@novell.com>
Sun, 8 Nov 2009 11:12:14 +0000 (8 12:12 +0100)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Sun, 8 Nov 2009 15:44:30 +0000 (8 07:44 -0800)
tree244dea2f091102cf21831a4097354fe6cf5f8e0f
parent761434a318a64bf521f8abcc920e1d9837640fa2
x86/PCI: Adjust GFP mask handling for coherent allocations

Rather than forcing GFP flags and DMA mask to be inconsistent,
GFP flags should be determined even for the fallback device
through dma_alloc_coherent_mask()/dma_alloc_coherent_gfp_flags().

This restores 64-bit behavior as it was prior to commits
8965eb19386fdf5ccd0ef8b02593eb8560aa3416 and
4a367f3a9dbf2e7ffcee4702203479809236ee6e (not sure why there are
two of them), where GFP_DMA was forced on for 32-bit, but not
for 64-bit, with the slight adjustment that afaict even 32-bit
doesn't need this without CONFIG_ISA.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
LKML-Reference: <4AF18187020000780001D8AA@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
arch/x86/include/asm/dma-mapping.h
arch/x86/kernel/pci-dma.c