From 4cf566a7c60ddce19d2ea96ef611ed4ea8eff463 Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@austin.ibm.com>
Date: Wed, 7 Nov 2007 15:43:59 -0600
Subject: [PATCH] --- yaml --- r: 82319 b: refs/heads/master c:
 94688cf2454986309fbcd495233ba2423786a14a h: refs/heads/master i:   82317:
 1b9166088e01fe620146efe2186a87501ae9d2f1   82315:
 e834e3e569498886f0bbda20c64630a94985bf93   82311:
 e4e9509f8198f084d5181f473d5beebf6d5a349d   82303:
 e8e7fce6eb94ea72c0b0f88f144c5d49f4e38391 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pci/msi.c   | 3 +--
 trunk/drivers/pci/pci.h   | 6 ------
 trunk/include/linux/pci.h | 2 ++
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d2f28118c75b..57e5baa9b0fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b7c9fcaa147662628078c83ecaf1ef2c5c9c9d0
+refs/heads/master: 94688cf2454986309fbcd495233ba2423786a14a
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index 07c9f09c856d..30de51fcd68c 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -230,7 +230,6 @@ static void pci_intx_for_msi(struct pci_dev *dev, int enable)
 		pci_intx(dev, enable);
 }
 
-#ifdef CONFIG_PM
 static void __pci_restore_msi_state(struct pci_dev *dev)
 {
 	int pos;
@@ -288,7 +287,7 @@ void pci_restore_msi_state(struct pci_dev *dev)
 	__pci_restore_msi_state(dev);
 	__pci_restore_msix_state(dev);
 }
-#endif	/* CONFIG_PM */
+EXPORT_SYMBOL_GPL(pci_restore_msi_state);
 
 /**
  * msi_capability_init - configure device's MSI capability structure
diff --git a/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h
index fc87e14b50de..4c4613387786 100644
--- a/trunk/drivers/pci/pci.h
+++ b/trunk/drivers/pci/pci.h
@@ -45,12 +45,6 @@ static inline void pci_no_msi(void) { }
 static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
 #endif
 
-#if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)
-void pci_restore_msi_state(struct pci_dev *dev);
-#else
-static inline void pci_restore_msi_state(struct pci_dev *dev) {}
-#endif
-
 #ifdef CONFIG_PCIEAER
 void pci_no_aer(void);
 #else
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index c53d6cf723d1..87aab07e239a 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -668,6 +668,7 @@ static inline int pci_enable_msix(struct pci_dev* dev,
 	struct msix_entry *entries, int nvec) {return -1;}
 static inline void pci_disable_msix(struct pci_dev *dev) {}
 static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) {}
+static inline void pci_restore_msi_state(struct pci_dev *dev) {}
 #else
 extern int pci_enable_msi(struct pci_dev *dev);
 extern void pci_disable_msi(struct pci_dev *dev);
@@ -675,6 +676,7 @@ extern int pci_enable_msix(struct pci_dev* dev,
 	struct msix_entry *entries, int nvec);
 extern void pci_disable_msix(struct pci_dev *dev);
 extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
+extern void pci_restore_msi_state(struct pci_dev *dev);
 #endif
 
 #ifdef CONFIG_HT_IRQ