Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg...

[sfrench/cifs-2.6.git] / drivers / iommu / intel / iommu.h

diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index ba9be915eb844ca24ed8e312858993ec96d813f9..d796d0d9b114a4cf29bda9202636a05df091421d 100644 (file)
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -714,7 +714,7 @@ struct intel_iommu {
        struct iopf_queue *iopf_queue;
        unsigned char iopfq_name[16];
        struct q_inval  *qi;            /* Queued invalidation info */
-       u32 *iommu_state; /* Store iommu states between suspend and resume.*/
+       u32 iommu_state[MAX_SR_DMAR_REGS]; /* Store iommu states between suspend and resume.*/
 
 #ifdef CONFIG_IRQ_REMAP
        struct ir_table *ir_table;      /* Interrupt remapping info */