diff options
-rw-r--r-- | drivers/pci/msi.c | 8 | ||||
-rw-r--r-- | drivers/pci/msi.h | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 8e1ba0b7a8e4..48723d6fa60f 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
@@ -137,6 +137,8 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask) | |||
137 | break; | 137 | break; |
138 | } | 138 | } |
139 | } | 139 | } |
140 | #else | ||
141 | #define set_msi_affinity NULL | ||
140 | #endif /* CONFIG_SMP */ | 142 | #endif /* CONFIG_SMP */ |
141 | 143 | ||
142 | static void mask_MSI_irq(unsigned int vector) | 144 | static void mask_MSI_irq(unsigned int vector) |
@@ -214,7 +216,7 @@ static struct hw_interrupt_type msix_irq_type = { | |||
214 | .disable = mask_MSI_irq, | 216 | .disable = mask_MSI_irq, |
215 | .ack = mask_MSI_irq, | 217 | .ack = mask_MSI_irq, |
216 | .end = end_msi_irq_w_maskbit, | 218 | .end = end_msi_irq_w_maskbit, |
217 | .set_affinity = set_msi_irq_affinity | 219 | .set_affinity = set_msi_affinity |
218 | }; | 220 | }; |
219 | 221 | ||
220 | /* | 222 | /* |
@@ -230,7 +232,7 @@ static struct hw_interrupt_type msi_irq_w_maskbit_type = { | |||
230 | .disable = mask_MSI_irq, | 232 | .disable = mask_MSI_irq, |
231 | .ack = mask_MSI_irq, | 233 | .ack = mask_MSI_irq, |
232 | .end = end_msi_irq_w_maskbit, | 234 | .end = end_msi_irq_w_maskbit, |
233 | .set_affinity = set_msi_irq_affinity | 235 | .set_affinity = set_msi_affinity |
234 | }; | 236 | }; |
235 | 237 | ||
236 | /* | 238 | /* |
@@ -246,7 +248,7 @@ static struct hw_interrupt_type msi_irq_wo_maskbit_type = { | |||
246 | .disable = do_nothing, | 248 | .disable = do_nothing, |
247 | .ack = do_nothing, | 249 | .ack = do_nothing, |
248 | .end = end_msi_irq_wo_maskbit, | 250 | .end = end_msi_irq_wo_maskbit, |
249 | .set_affinity = set_msi_irq_affinity | 251 | .set_affinity = set_msi_affinity |
250 | }; | 252 | }; |
251 | 253 | ||
252 | static void msi_data_init(struct msg_data *msi_data, | 254 | static void msi_data_init(struct msg_data *msi_data, |
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h index 402136a5c9e4..4ac52d441e47 100644 --- a/drivers/pci/msi.h +++ b/drivers/pci/msi.h | |||
@@ -22,12 +22,6 @@ extern int vector_irq[NR_VECTORS]; | |||
22 | extern void (*interrupt[NR_IRQS])(void); | 22 | extern void (*interrupt[NR_IRQS])(void); |
23 | extern int pci_vector_resources(int last, int nr_released); | 23 | extern int pci_vector_resources(int last, int nr_released); |
24 | 24 | ||
25 | #ifdef CONFIG_SMP | ||
26 | #define set_msi_irq_affinity set_msi_affinity | ||
27 | #else | ||
28 | #define set_msi_irq_affinity NULL | ||
29 | #endif | ||
30 | |||
31 | /* | 25 | /* |
32 | * MSI-X Address Register | 26 | * MSI-X Address Register |
33 | */ | 27 | */ |