Commit a4c2baa6 authored by FUJITA Tomonori's avatar FUJITA Tomonori
Browse files

x86: replace is_buffer_dma_capable() with dma_capable 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
parent 99becaca

arch/x86/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, 
		return NULL;



	addr = page_to_phys(page);

	if (!is_buffer_dma_capable(dma_mask, addr, size)) {

	if (addr + size > dma_mask) {

		__free_pages(page, get_order(size));



		if (dma_mask < DMA_BIT_MASK(32) && !(flag & GFP_DMA)) {

arch/x86/kernel/pci-gart_64.c

+2 −3
Original line number Diff line number Diff line
@@ -190,14 +190,13 @@ static void iommu_full(struct device *dev, size_t size, int dir) 
static inline int

need_iommu(struct device *dev, unsigned long addr, size_t size)

{

	return force_iommu ||

		!is_buffer_dma_capable(*dev->dma_mask, addr, size);

	return force_iommu || !dma_capable(dev, addr, size);

}



static inline int

nonforced_iommu(struct device *dev, unsigned long addr, size_t size)

{

	return !is_buffer_dma_capable(*dev->dma_mask, addr, size);

	return !dma_capable(dev, addr, size);

}



/* Map a single continuous physical area into the IOMMU.

arch/x86/kernel/pci-nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
static int

check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)

{

	if (hwdev && !is_buffer_dma_capable(*hwdev->dma_mask, bus, size)) {

	if (hwdev && !dma_capable(hwdev, bus, size)) {

		if (*hwdev->dma_mask >= DMA_BIT_MASK(32))

			printk(KERN_ERR

			    "nommu_%s: overflow %Lx+%zu of device mask %Lx\n",