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
..
alpha
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 14:00:15 -07:00
arc
DeviceTree for 3.16:
2014-06-04 10:02:38 -07:00
arm
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
arm64
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
avr32
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
blackfin
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
c6x
DeviceTree for 3.16:
2014-06-04 10:02:38 -07:00
cris
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
frv
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
hexagon
Hexagon: Delete stale barrier.h
2014-05-01 10:09:47 -07:00
ia64
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
m32r
arch,m32r: Convert smp_mb__*()
2014-04-18 14:20:36 +02:00
m68k
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
metag
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
microblaze
DeviceTree for 3.16:
2014-06-04 10:02:38 -07:00
mips
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
mn10300
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
openrisc
DeviceTree for 3.16:
2014-06-04 10:02:38 -07:00
parisc
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
powerpc
x86: define _PAGE_NUMA by reusing software bits on the PMD and PTE levels
2014-06-04 16:53:55 -07:00
s390
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
score
arch,score: Convert smp_mb__*()
2014-04-18 14:20:43 +02:00
sh
sh: Replace __get_cpu_var uses
2014-06-04 16:53:52 -07:00
sparc
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
tile
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
um
mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts
2014-04-25 16:05:40 -07:00
unicore32
arch/unicore32/mm/ioremap.c: return NULL on invalid pfn
2014-06-04 16:53:53 -07:00
x86
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
xtensa
DeviceTree for 3.16:
2014-06-04 10:02:38 -07:00
.gitignore
Kconfig
uprobes: Kconfig dependency fix
2014-03-18 16:39:33 -04:00