Yinghai is working on a regression fix ("PCI: Separate stop and remove devices in pciehp") that needs to go into v3.11, and his fix will be simpler if we remove the module option for pciehp in v3.11. That will mean he won't have to export pci_stop_bus_device() and pci_remove_bus_device() for use by modules. So these two patches convert CONFIG_HOTPLUG_PCI and CONFIG_HOTPLUG_PCI_PCIE to be bool (not tristate) and update defconfig files that had CONFIG_HOTPLUG_PCI=m. The motivation was for CONFIG_HOTPLUG_PCI_PCIE, but I also converted CONFIG_HOTPLUG_PCI to bool because the CONFIG_HOTPLUG_PCI=m and CONFIG_HOTPLUG_PCI_PCIE=y combination was accepted by Kconfig and builds a kernel, but pciehp doesn't actually work in that case (pointed out by Yinghai, thanks!) These are intended for v3.11. --- Bjorn Helgaas (2): PCI: hotplug: Convert to be builtin only, not modular PCI: pciehp: Convert pciehp to be builtin only, not modular arch/ia64/configs/generic_defconfig | 2 +- arch/ia64/configs/gensparse_defconfig | 2 +- arch/ia64/configs/tiger_defconfig | 2 +- arch/ia64/configs/xen_domu_defconfig | 2 +- arch/powerpc/configs/ppc64_defconfig | 2 +- arch/powerpc/configs/ppc64e_defconfig | 2 +- arch/powerpc/configs/pseries_defconfig | 2 +- arch/sh/configs/sh03_defconfig | 2 +- drivers/pci/hotplug/Kconfig | 5 +---- drivers/pci/pcie/Kconfig | 5 +---- 10 files changed, 10 insertions(+), 16 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |