From c569f63e3bff6b023b097f8642b4ab50f01025a9 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Tue, 31 May 2011 00:22:52 +0100 Subject: [PATCH] --- yaml --- r: 252971 b: refs/heads/master c: 70e535d1e5d1e4317e894d6228b762cf9c3fbc6a h: refs/heads/master i: 252969: b531c072e85d3d565dbd9f1caf79dc2fe8285904 252967: 7f75740a1efd513d72ddc3cc7627f66f15ef5faa 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 821864304980..0059ff378b8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8519dc4401ddf8a5399f979870bbeeadbc111186 +refs/heads/master: 70e535d1e5d1e4317e894d6228b762cf9c3fbc6a diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c index b0c96d390802..a8867bd745e2 100644 --- a/trunk/drivers/pci/intel-iommu.c +++ b/trunk/drivers/pci/intel-iommu.c @@ -2147,7 +2147,7 @@ static inline int iommu_prepare_rmrr_dev(struct dmar_rmrr_unit *rmrr, if (pdev->dev.archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO) return 0; return iommu_prepare_identity_map(pdev, rmrr->base_address, - rmrr->end_address + 1); + rmrr->end_address); } #ifdef CONFIG_DMAR_FLOPPY_WA @@ -2161,7 +2161,7 @@ static inline void iommu_prepare_isa(void) return; printk(KERN_INFO "IOMMU: Prepare 0-16MiB unity mapping for LPC\n"); - ret = iommu_prepare_identity_map(pdev, 0, 16*1024*1024); + ret = iommu_prepare_identity_map(pdev, 0, 16*1024*1024 - 1); if (ret) printk(KERN_ERR "IOMMU: Failed to create 0-16MiB identity map; "