Akinobu Mita 38f7ea5a08 arch/x86/kernel/pci-dma.c: fix dma_generic_alloc_coherent() when CONFIG_DMA_CMA is enabled ... dma_generic_alloc_coherent() firstly attempts to allocate by dma_alloc_from_contiguous() if CONFIG_DMA_CMA is enabled. But the memory region allocated by it may not fit within the device's DMA mask. This change makes it fall back to usual alloc_pages_node() allocation for such cases. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Don Dutile <ddutile@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Andi Kleen <andi@firstfloor.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2014-06-04 16:53:57 -07:00
..
boot	Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next	2014-06-03 15:41:57 -07:00
configs	USB: remove CONFIG_USB_DEBUG from defconfig files	2014-05-28 09:40:45 -07:00
crypto
ia32
include	x86: enable DMA CMA with swiotlb	2014-06-04 16:53:57 -07:00
kernel	arch/x86/kernel/pci-dma.c: fix dma_generic_alloc_coherent() when CONFIG_DMA_CMA is enabled	2014-06-04 16:53:57 -07:00
kvm	At over 200 commits, covering almost all supported architectures, this	2014-06-04 08:47:12 -07:00
lguest
lib
math-emu
mm	x86, mm: probe memory block size for generic x86 64bit	2014-06-04 16:53:55 -07:00
net
oprofile
pci	x86: enable DMA CMA with swiotlb	2014-06-04 16:53:57 -07:00
platform
power
realmode
syscalls
tools
um
vdso
video
xen	xen: features and fixes for 3.16-rc0	2014-06-02 08:24:12 -07:00
.gitignore
Kbuild
Kconfig	x86: enable DMA CMA with swiotlb	2014-06-04 16:53:57 -07:00
Kconfig.cpu
Kconfig.debug
Makefile
Makefile_32.cpu
Makefile.um