diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-01-03 17:56:27 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-02-09 05:00:53 -0500 |
commit | 43f7392ba9e2585bf34f21399b1ed78692b5d437 (patch) | |
tree | c39a18e7bd3185bdfae392b8074fff75a90f39eb /drivers/pci/dmar.c | |
parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) |
intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
This fix should be safe since iommu->agaw is only used in intel-iommu.c.
And this file is only compiled with DMAR=y.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/pci/dmar.c')
-rw-r--r-- | drivers/pci/dmar.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index f5a662a50acb..2b4162d9ca30 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c | |||
@@ -491,7 +491,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) | |||
491 | int map_size; | 491 | int map_size; |
492 | u32 ver; | 492 | u32 ver; |
493 | static int iommu_allocated = 0; | 493 | static int iommu_allocated = 0; |
494 | int agaw; | 494 | int agaw = 0; |
495 | 495 | ||
496 | iommu = kzalloc(sizeof(*iommu), GFP_KERNEL); | 496 | iommu = kzalloc(sizeof(*iommu), GFP_KERNEL); |
497 | if (!iommu) | 497 | if (!iommu) |
@@ -507,6 +507,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) | |||
507 | iommu->cap = dmar_readq(iommu->reg + DMAR_CAP_REG); | 507 | iommu->cap = dmar_readq(iommu->reg + DMAR_CAP_REG); |
508 | iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG); | 508 | iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG); |
509 | 509 | ||
510 | #ifdef CONFIG_DMAR | ||
510 | agaw = iommu_calculate_agaw(iommu); | 511 | agaw = iommu_calculate_agaw(iommu); |
511 | if (agaw < 0) { | 512 | if (agaw < 0) { |
512 | printk(KERN_ERR | 513 | printk(KERN_ERR |
@@ -514,6 +515,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) | |||
514 | iommu->seq_id); | 515 | iommu->seq_id); |
515 | goto error; | 516 | goto error; |
516 | } | 517 | } |
518 | #endif | ||
517 | iommu->agaw = agaw; | 519 | iommu->agaw = agaw; |
518 | 520 | ||
519 | /* the registers might be more than one page */ | 521 | /* the registers might be more than one page */ |