| Message ID | 1388707565-16535-26-git-send-email-yinghai@kernel.org |
|---|---|
| State | Accepted |
| Headers | show |
[fixed Rafael's email address; I imagine you got a few bounces :)] On Thu, Jan 02, 2014 at 04:05:57PM -0800, Yinghai Lu wrote: > 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 <yinghai@kernel.org> Most of this series is x86-specific and outside the scope of PCI, so I assume somebody else will deal with it. This particular patch doesn't seem to depend on anything else, so I'll merge it. > --- > drivers/pci/Kconfig | 3 ++- > drivers/pci/ioapic.c | 6 +++++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig > index b6a99f7..893503f 100644 > --- a/drivers/pci/Kconfig > +++ b/drivers/pci/Kconfig > @@ -105,9 +105,10 @@ 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 X86_IO_APIC > default !X86 > > config PCI_LABEL > diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c > index 50ce680..2c2930e 100644 > --- a/drivers/pci/ioapic.c > +++ b/drivers/pci/ioapic.c > @@ -113,6 +113,10 @@ static struct pci_driver ioapic_driver = { > .remove = ioapic_remove, > }; > > -module_pci_driver(ioapic_driver); > +static int __init ioapic_init(void) > +{ > + return pci_register_driver(&ioapic_driver); > +} > +module_init(ioapic_init); > > MODULE_LICENSE("GPL"); > -- > 1.8.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 3, 2014 at 2:47 PM, Bjorn Helgaas <bhelgaas@google.com> wrote: > [fixed Rafael's email address; I imagine you got a few bounces :)] > > On Thu, Jan 02, 2014 at 04:05:57PM -0800, Yinghai Lu wrote: >> 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 <yinghai@kernel.org> > > Most of this series is x86-specific and outside the scope of PCI, so I > assume somebody else will deal with it. Yes. > > This particular patch doesn't seem to depend on anything else, so I'll > merge it. yes. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index b6a99f7..893503f 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -105,9 +105,10 @@ 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 X86_IO_APIC default !X86 config PCI_LABEL diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c index 50ce680..2c2930e 100644 --- a/drivers/pci/ioapic.c +++ b/drivers/pci/ioapic.c @@ -113,6 +113,10 @@ static struct pci_driver ioapic_driver = { .remove = ioapic_remove, }; -module_pci_driver(ioapic_driver); +static int __init ioapic_init(void) +{ + return pci_register_driver(&ioapic_driver); +} +module_init(ioapic_init); MODULE_LICENSE("GPL");
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 <yinghai@kernel.org> --- drivers/pci/Kconfig | 3 ++- drivers/pci/ioapic.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-)