From 2aa8d6875a4e458551d4f55406b6bf3596bdeda9 Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Wed, 8 Apr 2009 09:09:18 -0500 Subject: [PATCH] --- yaml --- r: 145879 b: refs/heads/master c: ef5722f698bde01cfec2b98fff733a48663ebf55 h: refs/heads/master i: 145877: 9abe54104aec7b88ee54373f3f7813828dcf736e 145875: 7f6305c53bab6619ade95f4b46715762a381fb79 145871: d11a313d79ca6b6f07ab970c4356c12fe9c09302 v: v3 --- [refs] | 2 +- trunk/lib/swiotlb.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f86e01b6d6dd..fcca5a9e9dc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd6b02fe427f30520d0adc94aa52352367227873 +refs/heads/master: ef5722f698bde01cfec2b98fff733a48663ebf55 diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c index e8a47c8cf77e..d81afab85167 100644 --- a/trunk/lib/swiotlb.c +++ b/trunk/lib/swiotlb.c @@ -145,6 +145,12 @@ static void *swiotlb_bus_to_virt(dma_addr_t address) return phys_to_virt(swiotlb_bus_to_phys(address)); } +int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev, + dma_addr_t addr, size_t size) +{ + return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size); +} + int __weak swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size) { return 0; @@ -309,10 +315,10 @@ swiotlb_late_init_with_default_size(size_t default_size) return -ENOMEM; } -static int +static inline int address_needs_mapping(struct device *hwdev, dma_addr_t addr, size_t size) { - return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size); + return swiotlb_arch_address_needs_mapping(hwdev, addr, size); } static inline int range_needs_mapping(phys_addr_t paddr, size_t size)