From 3f230fe9ebe1f30728059378cbc602ef20f13a68 Mon Sep 17 00:00:00 2001
From: Grant Grundler <iod00d@hp.com>
Date: Tue, 3 Jan 2006 18:51:46 -0800
Subject: [PATCH] --- yaml --- r: 19243 b: refs/heads/master c:
 8169b5d2384a0acd9ea3bb86bf5988cd7d62d03a h: refs/heads/master i:   19241:
 7cc2b645c564738cbace4e04ab1c230200da0cf2   19239:
 41c6b4fe1ce99bb956e9305edbafb293a1383003 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/msi.c | 8 +++++---
 trunk/drivers/pci/msi.h | 6 ------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index e5b6720ab421..b4603153be53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8d65713332cf6306889a3036142a17e01e3447e
+refs/heads/master: 8169b5d2384a0acd9ea3bb86bf5988cd7d62d03a
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index 8e1ba0b7a8e4..48723d6fa60f 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -137,6 +137,8 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
 		break;
 	}
 }
+#else
+#define set_msi_affinity NULL
 #endif /* CONFIG_SMP */
 
 static void mask_MSI_irq(unsigned int vector)
@@ -214,7 +216,7 @@ static struct hw_interrupt_type msix_irq_type = {
 	.disable	= mask_MSI_irq,
 	.ack		= mask_MSI_irq,
 	.end		= end_msi_irq_w_maskbit,
-	.set_affinity	= set_msi_irq_affinity
+	.set_affinity	= set_msi_affinity
 };
 
 /*
@@ -230,7 +232,7 @@ static struct hw_interrupt_type msi_irq_w_maskbit_type = {
 	.disable	= mask_MSI_irq,
 	.ack		= mask_MSI_irq,
 	.end		= end_msi_irq_w_maskbit,
-	.set_affinity	= set_msi_irq_affinity
+	.set_affinity	= set_msi_affinity
 };
 
 /*
@@ -246,7 +248,7 @@ static struct hw_interrupt_type msi_irq_wo_maskbit_type = {
 	.disable	= do_nothing,
 	.ack		= do_nothing,
 	.end		= end_msi_irq_wo_maskbit,
-	.set_affinity	= set_msi_irq_affinity
+	.set_affinity	= set_msi_affinity
 };
 
 static void msi_data_init(struct msg_data *msi_data,
diff --git a/trunk/drivers/pci/msi.h b/trunk/drivers/pci/msi.h
index 402136a5c9e4..4ac52d441e47 100644
--- a/trunk/drivers/pci/msi.h
+++ b/trunk/drivers/pci/msi.h
@@ -22,12 +22,6 @@ extern int vector_irq[NR_VECTORS];
 extern void (*interrupt[NR_IRQS])(void);
 extern int pci_vector_resources(int last, int nr_released);
 
-#ifdef CONFIG_SMP
-#define set_msi_irq_affinity	set_msi_affinity
-#else
-#define set_msi_irq_affinity	NULL
-#endif
-
 /*
  * MSI-X Address Register
  */