diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /include/linux/msi.h | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'include/linux/msi.h')
| -rw-r--r-- | include/linux/msi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h index 4f0bfe5912b2..e8c81fbd5f9c 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h | |||
| @@ -270,6 +270,8 @@ enum { | |||
| 270 | MSI_FLAG_MULTI_PCI_MSI = (1 << 2), | 270 | MSI_FLAG_MULTI_PCI_MSI = (1 << 2), |
| 271 | /* Support PCI MSIX interrupts */ | 271 | /* Support PCI MSIX interrupts */ |
| 272 | MSI_FLAG_PCI_MSIX = (1 << 3), | 272 | MSI_FLAG_PCI_MSIX = (1 << 3), |
| 273 | /* Needs early activate, required for PCI */ | ||
| 274 | MSI_FLAG_ACTIVATE_EARLY = (1 << 4), | ||
| 273 | }; | 275 | }; |
| 274 | 276 | ||
| 275 | int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, | 277 | int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, |