From e17ebcfdfa4c210ea88f6e64b8d597769321b03c Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 23 Oct 2007 09:32:25 +0200 Subject: [PATCH] --- yaml --- r: 72189 b: refs/heads/master c: 12d4d40e6fd583d32daeac0bc42123b23b7c40b7 h: refs/heads/master i: 72187: fe72a57042443ba3aa6a59c86e8d4b117540118c v: v3 --- [refs] | 2 +- trunk/drivers/pci/intel-iommu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e23aebcee3c0..df899249fc6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b61e8f4844fd0767b656bd1f983933cc3d0102f3 +refs/heads/master: 12d4d40e6fd583d32daeac0bc42123b23b7c40b7 diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c index b3d70310af49..0c4ab3b07274 100644 --- a/trunk/drivers/pci/intel-iommu.c +++ b/trunk/drivers/pci/intel-iommu.c @@ -1962,7 +1962,7 @@ static void intel_free_coherent(struct device *hwdev, size_t size, free_pages((unsigned long)vaddr, order); } -#define SG_ENT_VIRT_ADDRESS(sg) (page_address((sg)->page) + (sg)->offset) +#define SG_ENT_VIRT_ADDRESS(sg) (sg_virt((sg))) static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, int dir) { @@ -2010,7 +2010,7 @@ static int intel_nontranslate_map_sg(struct device *hddev, struct scatterlist *sg; for_each_sg(sglist, sg, nelems, i) { - BUG_ON(!sg->page); + BUG_ON(!sg_page(sg)); sg->dma_address = virt_to_bus(SG_ENT_VIRT_ADDRESS(sg)); sg->dma_length = sg->length; }