1 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 9310c699a37d..e6ca56de9936 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -271,7 +271,7 @@ struct qi_desc {
 };
 
 struct q_inval {
-        spinlock_t      q_lock;
+        raw_spinlock_t  q_lock;
         struct qi_desc  *desc;          /* invalidation queue */
         int             *desc_status;   /* desc status */
         int             free_head;      /* first free entry */
@@ -279,7 +279,7 @@ struct q_inval {
         int             free_cnt;
 };
 
-#ifdef CONFIG_INTR_REMAP
+#ifdef CONFIG_IRQ_REMAP
 /* 1MB - maximum possible interrupt remapping table size */
 #define INTR_REMAP_PAGE_ORDER   8
 #define INTR_REMAP_TABLE_REG_SIZE       0xf
@@ -311,14 +311,14 @@ struct intel_iommu {
         u64             cap;
         u64             ecap;
         u32             gcmd; /* Holds TE, EAFL. Don't need SRTP, SFL, WBF */
-        spinlock_t      register_lock; /* protect register handling */
+        raw_spinlock_t  register_lock; /* protect register handling */
         int             seq_id; /* sequence id of the iommu */
         int             agaw; /* agaw of this iommu */
         int             msagaw; /* max sagaw of this iommu */
         unsigned int    irq;
         unsigned char   name[13];    /* Device Name */
 
-#ifdef CONFIG_DMAR
+#ifdef CONFIG_INTEL_IOMMU
         unsigned long   *domain_ids; /* bitmap of domains */
         struct dmar_domain **domains; /* ptr to domains */
         spinlock_t      lock; /* protect context, domain ids */
@@ -329,7 +329,7 @@ struct intel_iommu {
         struct q_inval  *qi;            /* Queued invalidation info */
         u32 *iommu_state; /* Store iommu states between suspend and resume.*/
 
-#ifdef CONFIG_INTR_REMAP
+#ifdef CONFIG_IRQ_REMAP
         struct ir_table *ir_table;      /* Interrupt remapping info */
 #endif
         int             node;