Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f7392b authored by Joerg Roedel's avatar Joerg Roedel Committed by David Woodhouse
Browse files

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: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 8e492151

drivers/pci/dmar.c

+3 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) 
	int map_size;

	u32 ver;

	static int iommu_allocated = 0;

	int agaw;

	int agaw = 0;



	iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);

	if (!iommu)
@@ -507,6 +507,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) 
	iommu->cap = dmar_readq(iommu->reg + DMAR_CAP_REG);

	iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);



#ifdef CONFIG_DMAR

	agaw = iommu_calculate_agaw(iommu);

	if (agaw < 0) {

		printk(KERN_ERR
@@ -514,6 +515,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) 
			iommu->seq_id);

		goto error;

	}

#endif

	iommu->agaw = agaw;



	/* the registers might be more than one page */