From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Yinghai Lu To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Bjorn Helgaas , "Rafael J. Wysocki" Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v3 24/27] PCI, x86: Make ioapic hotplug support built-in Date: Fri, 7 Jun 2013 15:31:10 -0700 Message-Id: <1370644273-10495-25-git-send-email-yinghai@kernel.org> In-Reply-To: <1370644273-10495-1-git-send-email-yinghai@kernel.org> References: <1370644273-10495-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: ioapic hotplug should be built-in like pci root bus hotplug. Also need to make it depends on X86_IO_APIC. Signed-off-by: Yinghai Lu --- drivers/pci/Kconfig | 3 ++- drivers/pci/ioapic.c | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 6d51aa6..720989f 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -110,10 +110,11 @@ config PCI_PASID If unsure, say N. config PCI_IOAPIC - tristate "PCI IO-APIC hotplug support" if X86 + bool "PCI IO-APIC hotplug support" if X86 depends on PCI depends on ACPI depends on HOTPLUG + depends on X86_IO_APIC default !X86 config PCI_LABEL diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c index 3c6bbdd..7d6b157 100644 --- a/drivers/pci/ioapic.c +++ b/drivers/pci/ioapic.c @@ -117,13 +117,6 @@ static int __init ioapic_init(void) { return pci_register_driver(&ioapic_driver); } - -static void __exit ioapic_exit(void) -{ - pci_unregister_driver(&ioapic_driver); -} - module_init(ioapic_init); -module_exit(ioapic_exit); MODULE_LICENSE("GPL"); -- 1.8.1.4