diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-12 12:41:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-12 12:41:51 -0700 |
| commit | 25db69188e0369a8c4ac53f71e935a8b6e22e117 (patch) | |
| tree | a371b975f33f280e1c3e43e9c920d578805312ab /include | |
| parent | 0e1117b2572b82ddc329d570f7c9bab355e4dc3b (diff) | |
| parent | f3b0946d629c8bfbd3e5f038e30cb9c711a35f10 (diff) | |
| download | linux-25db69188e0369a8c4ac53f71e935a8b6e22e117.tar.gz linux-25db69188e0369a8c4ac53f71e935a8b6e22e117.tar.bz2 linux-25db69188e0369a8c4ac53f71e935a8b6e22e117.zip | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar:
"A fix for an MSI regression"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq/msi: Make sure PCI MSIs are activated early
Diffstat (limited to 'include')
| -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 { MSI_FLAG_MULTI_PCI_MSI = (1 << 2), /* Support PCI MSIX interrupts */ MSI_FLAG_PCI_MSIX = (1 << 3), + /* Needs early activate, required for PCI */ + MSI_FLAG_ACTIVATE_EARLY = (1 << 4), }; int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, |