From 7025119d1c0cd3a28669efd56beb29390333ae9a Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Wed, 8 Apr 2009 09:09:17 -0500 Subject: [PATCH] --- yaml --- r: 145878 b: refs/heads/master c: dd6b02fe427f30520d0adc94aa52352367227873 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/lib/swiotlb.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9f3ac4254857..f86e01b6d6dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67131ad0514d7105b55003a0506209cf1bba3f00 +refs/heads/master: dd6b02fe427f30520d0adc94aa52352367227873 diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c index 4fd6a76e728c..e8a47c8cf77e 100644 --- a/trunk/lib/swiotlb.c +++ b/trunk/lib/swiotlb.c @@ -640,7 +640,6 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, struct dma_attrs *attrs) { phys_addr_t phys = page_to_phys(page) + offset; - void *ptr = page_address(page) + offset; dma_addr_t dev_addr = swiotlb_phys_to_bus(dev, phys); void *map; @@ -651,7 +650,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, * buffering it. */ if (!address_needs_mapping(dev, dev_addr, size) && - !range_needs_mapping(virt_to_phys(ptr), size)) + !range_needs_mapping(phys, size)) return dev_addr; /*