diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-08-13 11:56:59 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-08-13 19:49:56 +0200 |
| commit | 543c8dcf1d3762c6fe372acf78eedc8898709106 (patch) | |
| tree | f563cbc81cb4462f9394e4b9ae5141ff9070d742 /drivers/iommu/intel_irq_remapping.c | |
| parent | iommu/vt-d: Make two functions static (diff) | |
| download | linux-543c8dcf1d3762c6fe372acf78eedc8898709106.tar.xz linux-543c8dcf1d3762c6fe372acf78eedc8898709106.zip | |
iommu/vt-d: Access iomem correctly
This fixes wrong accesses to iomem introduced by the kdump
fixing code.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/intel_irq_remapping.c')
| -rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 27cdfa84ec5b..9ec4e0d94ffd 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -384,7 +384,7 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev) static int iommu_load_old_irte(struct intel_iommu *iommu) { - struct irte *old_ir_table; + struct irte __iomem *old_ir_table; phys_addr_t irt_phys; unsigned int i; size_t size; @@ -413,7 +413,7 @@ static int iommu_load_old_irte(struct intel_iommu *iommu) return -ENOMEM; /* Copy data over */ - memcpy(iommu->ir_table->base, old_ir_table, size); + memcpy_fromio(iommu->ir_table->base, old_ir_table, size); __iommu_flush_cache(iommu, iommu->ir_table->base, size); |