diff options
| author | Becky Bruce <beckyb@kernel.crashing.org> | 2009-04-08 09:09:17 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 16:18:36 +0200 |
| commit | dd6b02fe427f30520d0adc94aa52352367227873 (patch) | |
| tree | 9b62f386e7d3e58aa45c679823820b0e5c28f31f | |
| parent | 67131ad0514d7105b55003a0506209cf1bba3f00 (diff) | |
| download | linux-3.10-dd6b02fe427f30520d0adc94aa52352367227873.tar.gz linux-3.10-dd6b02fe427f30520d0adc94aa52352367227873.tar.bz2 linux-3.10-dd6b02fe427f30520d0adc94aa52352367227873.zip | |
swiotlb: map_page fix for highmem systems
The current code calls virt_to_phys() on address that might
be in highmem, which is bad. This wasn't needed, anyway, because
we already have the physical address we need.
Get rid of the now-unused virtual address as well.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: jeremy@goop.org
Cc: ian.campbell@citrix.com
LKML-Reference: <1239199761-22886-4-git-send-email-galak@kernel.crashing.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | lib/swiotlb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 4fd6a76e728..e8a47c8cf77 100644 --- a/lib/swiotlb.c +++ b/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; /* |