tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
swiotlb: use coherent_dma_mask in alloc_coherent
MAINTAINERS: remove me as RAID maintainer

Linus Torvalds b6584065 376fdd2a

+7 -5
unified split
-2
MAINTAINERS
··· 3928 3928 S: Maintained 3929 3929 3930 3930 SOFTWARE RAID (Multiple Disks) SUPPORT 3931 - P: Ingo Molnar 3932 - M: mingo@redhat.com 3933 3931 P: Neil Brown 3934 3932 M: neilb@suse.de 3935 3933 L: linux-raid@vger.kernel.org
+7 -3
lib/swiotlb.c
··· 467 467 dma_addr_t dev_addr; 468 468 void *ret; 469 469 int order = get_order(size); 470 + u64 dma_mask = DMA_32BIT_MASK; 471 + 472 + if (hwdev && hwdev->coherent_dma_mask) 473 + dma_mask = hwdev->coherent_dma_mask; 470 474 471 475 ret = (void *)__get_free_pages(flags, order); 472 - if (ret && address_needs_mapping(hwdev, virt_to_bus(ret), size)) { 476 + if (ret && !is_buffer_dma_capable(dma_mask, virt_to_bus(ret), size)) { 473 477 /* 474 478 * The allocated memory isn't reachable by the device. 475 479 * Fall back on swiotlb_map_single(). ··· 497 493 dev_addr = virt_to_bus(ret); 498 494 499 495 /* Confirm address can be DMA'd by device */ 500 - if (address_needs_mapping(hwdev, dev_addr, size)) { 496 + if (!is_buffer_dma_capable(dma_mask, dev_addr, size)) { 501 497 printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n", 502 - (unsigned long long)*hwdev->dma_mask, 498 + (unsigned long long)dma_mask, 503 499 (unsigned long long)dev_addr); 504 500 505 501 /* DMA_TO_DEVICE to avoid memcpy in unmap_single */