[PATCH 07/11] x86: Rename MSI macro name

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Sheng Yang
Date: Wednesday, November 19, 2008 - 4:45 am

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
---
 arch/x86/include/asm/msidef.h |    4 ++--
 arch/x86/kernel/io_apic.c     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/msidef.h b/arch/x86/include/asm/msidef.h
index 6706b30..988cb27 100644
--- a/arch/x86/include/asm/msidef.h
+++ b/arch/x86/include/asm/msidef.h
@@ -15,8 +15,8 @@
 					 MSI_DATA_VECTOR_MASK)
 
 #define MSI_DATA_DELIVERY_MODE_SHIFT	8
-#define  MSI_DATA_DELIVERY_FIXED	(0 << MSI_DATA_DELIVERY_MODE_SHIFT)
-#define  MSI_DATA_DELIVERY_LOWPRI	(1 << MSI_DATA_DELIVERY_MODE_SHIFT)
+#define  MSI_DATA_DELIVERY_FIXED_BIT	(0 << MSI_DATA_DELIVERY_MODE_SHIFT)
+#define  MSI_DATA_DELIVERY_LOWPRI_BIT	(1 << MSI_DATA_DELIVERY_MODE_SHIFT)
 
 #define MSI_DATA_LEVEL_SHIFT		14
 #define	 MSI_DATA_LEVEL_DEASSERT	(0 << MSI_DATA_LEVEL_SHIFT)
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 7a3f202..9cf604d 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -3005,8 +3005,8 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms
 			MSI_DATA_TRIGGER_EDGE |
 			MSI_DATA_LEVEL_ASSERT |
 			((INT_DELIVERY_MODE != dest_LowestPrio) ?
-				MSI_DATA_DELIVERY_FIXED:
-				MSI_DATA_DELIVERY_LOWPRI) |
+				MSI_DATA_DELIVERY_FIXED_BIT:
+				MSI_DATA_DELIVERY_LOWPRI_BIT) |
 			MSI_DATA_VECTOR(cfg->vector);
 	}
 	return err;
-- 
1.5.4.5

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/11][v5] Enable MSI for KVM, Sheng Yang, (Wed Nov 19, 4:45 am)
[PATCH 07/11] x86: Rename MSI macro name, Sheng Yang, (Wed Nov 19, 4:45 am)
[PATCH 08/11] x86: Add MSI delivery mode value, Sheng Yang, (Wed Nov 19, 4:45 am)
[PATCH 10/11] KVM: Enable MSI for device assignment, Sheng Yang, (Wed Nov 19, 4:45 am)
[PATCH 11/11] KVM: MSI to INTx translate, Sheng Yang, (Wed Nov 19, 4:45 am)
Re: [PATCH 07/11] x86: Rename MSI macro name, Avi Kivity, (Sun Nov 23, 3:12 am)
Re: [PATCH 07/11] x86: Rename MSI macro name, Sheng Yang, (Sun Nov 23, 7:02 pm)