From: Qing He Subject: [PATCH 3/3] xen: re-enable msi Date: Tue, 18 Aug 2009 13:45:14 +0800 Message-ID: <1250574314-19600-4-git-send-email-qing.he@intel.com> References: <> <1250574314-19600-1-git-send-email-qing.he@intel.com> Return-path: In-Reply-To: <1250574314-19600-1-git-send-email-qing.he@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: jeremy@goop.org, yunhong.jiang@intel.com, Qing He List-Id: xen-devel@lists.xenproject.org remove pci_no_msi for Xen Dom 0, also move pci_no_msi out of public header effectively revert commit bf89bc290d429ce223c1018628130ddabc66614e xen: disable MSI Signed-off-by: Yunhong Jiang Signed-off-by: Qing He --- arch/x86/xen/apic.c | 3 --- drivers/pci/pci.h | 2 ++ include/linux/pci.h | 6 ------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c index 496f07d..ee0db39 100644 --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include @@ -48,8 +47,6 @@ void xen_init_apic(void) if (!xen_initial_domain()) return; - pci_no_msi(); - #ifdef CONFIG_ACPI /* * Pretend ACPI found our lapic even though we've disabled it, diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 79ada7b..d03f6b9 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -111,8 +111,10 @@ extern struct rw_semaphore pci_bus_sem; extern unsigned int pci_pm_d3_delay; #ifdef CONFIG_PCI_MSI +void pci_no_msi(void); extern void pci_msi_init_pci_dev(struct pci_dev *dev); #else +static inline void pci_no_msi(void) { } static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } #endif diff --git a/include/linux/pci.h b/include/linux/pci.h index 75b0645..e831a10 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1256,11 +1256,5 @@ static inline irqreturn_t pci_sriov_migration(struct pci_dev *dev) } #endif -#ifdef CONFIG_PCI_MSI -void pci_no_msi(void); -#else -static inline void pci_no_msi(void) { } -#endif - #endif /* __KERNEL__ */ #endif /* LINUX_PCI_H */ -- 1.6.0