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

crypto: ghash-clmulni-intel - use C implementation for setkey()

2014-04-01 17:22:47 +08:00

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

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm into next

2014-06-04 08:47:12 -07:00

lguest

asmlinkage, x86: Add explicit __visible to arch/x86/*

2014-05-05 16:07:44 -07:00

lib

x86, boot: Carve out early cmdline parsing function

2014-05-20 20:21:24 -07:00

math-emu

asmlinkage, x86: Add explicit __visible to arch/x86/*

2014-05-05 16:07:44 -07:00

mm

x86, mm: probe memory block size for generic x86 64bit

2014-06-04 16:53:55 -07:00

net

net: filter: x86: fix JIT address randomization

2014-05-13 18:31:13 -04:00

oprofile

x86, oprofile, nmi: Fix CPU hotplug callback registration

2014-03-20 13:43:43 +01:00

pci

x86: enable DMA CMA with swiotlb

2014-06-04 16:53:57 -07:00

platform

asmlinkage, x86: Add explicit __visible to arch/x86/*

2014-05-05 16:07:44 -07:00

power

asmlinkage, x86: Add explicit __visible to arch/x86/*

2014-05-05 16:07:44 -07:00

realmode

x86/build: Supress realmode.bin is up to date message

2014-04-16 15:17:24 +02:00

syscalls

x86/build: Supress "Nothing to be done for ..." messages

2014-04-14 11:44:36 +02:00

tools

x86/build: Supress "Nothing to be done for ..." messages

2014-04-14 11:44:36 +02:00

um

x86: Remove CONFIG_X86_OOSTORE

2014-03-11 10:16:18 -07:00

vdso

x86-64, modify_ldt: Make support for 16-bit segments a runtime option

2014-05-14 16:33:54 -07:00

video

…

xen

Merge tag 'stable/for-linus-3.16-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip into next

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

Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-04-02 13:15:58 -07:00

Kconfig.debug

x86/efi: Dump the EFI page table

2014-03-04 16:17:17 +00:00

Makefile

x86-64, build: Fix stack protector Makefile breakage with 32-bit userland

2014-05-07 14:14:44 -07:00

Makefile_32.cpu

…

Makefile.um

…