From e2c6b0584bafdbcc36a36d47405b78d978423580 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 17 Oct 2011 11:46:06 -0700
Subject: [PATCH] --- yaml --- r: 282789 b: refs/heads/master c:
 a776c491ca5e38c26d9f66923ff574d041e747f4 h: refs/heads/master i:   282787:
 692ee5c6a3645e2523fd25cc0b6f2a379a0898d2 v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/pci/msi.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ca4daa39f43..c1d9d1671382 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a424948dde8421089826e2f782d0efe9e565707e
+refs/heads/master: a776c491ca5e38c26d9f66923ff574d041e747f4
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index e6b6b9c67023..337e16ab4a92 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -981,5 +981,15 @@ EXPORT_SYMBOL(pci_msi_enabled);
 
 void pci_msi_init_pci_dev(struct pci_dev *dev)
 {
+	int pos;
 	INIT_LIST_HEAD(&dev->msi_list);
+
+	/* Disable the msi hardware to avoid screaming interrupts
+	 * during boot.  This is the power on reset default so
+	 * usually this should be a noop.
+	 */
+	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
+	if (pos)
+		msi_set_enable(dev, pos, 0);
+	msix_set_enable(dev, 0);
 }