Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 145879
b: refs/heads/master
c: ef5722f
h: refs/heads/master
i:
  145877: 9abe541
  145875: 7f6305c
  145871: d11a313
v: v3
  • Loading branch information
Becky Bruce authored and Ingo Molnar committed Apr 8, 2009
1 parent 7025119 commit 2aa8d68
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dd6b02fe427f30520d0adc94aa52352367227873
refs/heads/master: ef5722f698bde01cfec2b98fff733a48663ebf55
10 changes: 8 additions & 2 deletions trunk/lib/swiotlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 2aa8d68

Please sign in to comment.