From c89d19a38584d48eae9bb302f5963cce30f5f26a Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 15 Jul 2011 03:12:13 +0000 Subject: [PATCH] --- yaml --- r: 263030 b: refs/heads/master c: e14bd7e614b57493e1cbefb8a06d3754bdd04e26 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/PCI/MSI-HOWTO.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e1adccc7a7ac..feb312e1c7fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6ffceb0ded9beeaddd9c246b3fec298c6b1f0c9 +refs/heads/master: e14bd7e614b57493e1cbefb8a06d3754bdd04e26 diff --git a/trunk/Documentation/PCI/MSI-HOWTO.txt b/trunk/Documentation/PCI/MSI-HOWTO.txt index d9c8d989f2b3..c9cffaf16f82 100644 --- a/trunk/Documentation/PCI/MSI-HOWTO.txt +++ b/trunk/Documentation/PCI/MSI-HOWTO.txt @@ -231,7 +231,7 @@ mask or unmask an interrupt, it should call disable_irq() / enable_irq(). 4.4 Handling devices implementing both MSI and MSI-X capabilities If a device implements both MSI and MSI-X capabilities, it can -run in either MSI mode or MSI-X mode but not both simultaneously. +run in either MSI mode or MSI-X mode, but not both simultaneously. This is a requirement of the PCI spec, and it is enforced by the PCI layer. Calling pci_enable_msi() when MSI-X is already enabled or pci_enable_msix() when MSI is already enabled results in an error.