From patchwork Thu Jun 18 01:03:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 31031 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5I141WC009592 for ; Thu, 18 Jun 2009 01:04:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754792AbZFRBD5 (ORCPT ); Wed, 17 Jun 2009 21:03:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753960AbZFRBD5 (ORCPT ); Wed, 17 Jun 2009 21:03:57 -0400 Received: from g4t0015.houston.hp.com ([15.201.24.18]:9837 "EHLO g4t0015.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753002AbZFRBD4 (ORCPT ); Wed, 17 Jun 2009 21:03:56 -0400 Received: from g4t0018.houston.hp.com (g4t0018.houston.hp.com [16.234.32.27]) by g4t0015.houston.hp.com (Postfix) with ESMTP id 1DDAE8208; Thu, 18 Jun 2009 01:03:58 +0000 (UTC) Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30]) by g4t0018.houston.hp.com (Postfix) with ESMTP id 41DCF1011B; Thu, 18 Jun 2009 01:03:58 +0000 (UTC) Received: by ldl.fc.hp.com (Postfix, from userid 17609) id 005E33B4006; Wed, 17 Jun 2009 19:03:57 -0600 (MDT) Date: Wed, 17 Jun 2009 19:03:57 -0600 From: Alex Chiang To: Jesse Barnes Cc: Randy Dunlap , Matthew Wilcox , Stephen Rothwell , linux-next@vger.kernel.org, LKML , "linux-pci@vger.kernel.org" , a.beregalov@gmail.com, lenb@kernel.org Subject: Re: linux-next: Tree for June 17 (pci/slot) Message-ID: <20090618010357.GC29472@ldl.fc.hp.com> References: <20090617155354.075c60ae.sfr@canb.auug.org.au> <4A39194B.2060200@oracle.com> <20090617163604.GT19977@parisc-linux.org> <20090617102901.6e39aac2@jbarnes-g45> <4A392B48.7060206@oracle.com> <20090617161001.734321be@jbarnes-g45> <20090618003808.GA29472@ldl.fc.hp.com> <20090618004612.GB29472@ldl.fc.hp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090618004612.GB29472@ldl.fc.hp.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org * Alex Chiang : > diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile > index ba6af16..0be4efd 100644 > --- a/drivers/pci/Makefile > +++ b/drivers/pci/Makefile > @@ -2,10 +2,11 @@ > # Makefile for the PCI bus specific drivers. > # > > -obj-y += access.o bus.o probe.o remove.o pci.o quirks.o slot.o \ > - pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \ > +obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ > + pci-driver.o search.o rom.o setup-res.o \ > irq.o > obj-$(CONFIG_PROC_FS) += proc.o > +obj-$(CONFIG_SYSFS) += slot.o pci-sysfs.o Sigh, this won't work because the PCI core blithely assumes we have sysfs: drivers/built-in.o: In function `pci_bus_add_device': /kio/work/achiang/kernels/linux-2.6/drivers/pci/bus.c:89: undefined reference to `pci_create_sysfs_dev_files' drivers/built-in.o: In function `pci_stop_dev': /kio/work/achiang/kernels/linux-2.6/drivers/pci/remove.c:24: undefined reference to `pci_remove_sysfs_dev_files' So, here is v3 that actually does build with !CONFIG_SYSFS. It touches a bit more now, but I believe it is still appropriate because neither pci_slot.ko nor any of the drivers in drivers/pci/hotplug/ are useful without sysfs. From: Alex Chiang PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS There is no way to interact with a physical PCI slot without sysfs, so encode the dependency and prevent this build error: drivers/pci/slot.c: In function 'pci_hp_create_module_link': drivers/pci/slot.c:327: error: 'module_kset' undeclared This patch _should_ make pci-sysfs.o depend on CONFIG_SYSFS too, but we cannot (yet) because the PCI core merrily assumes the existence of sysfs: drivers/built-in.o: In function `pci_bus_add_device': drivers/pci/bus.c:89: undefined reference to `pci_create_sysfs_dev_files' drivers/built-in.o: In function `pci_stop_dev': drivers/pci/remove.c:24: undefined reference to `pci_remove_sysfs_dev_files' So do the minimal bit for now and figure out how to untangle it later. Cc: Len Brown Reported-by: Stephen Rothwell Fix-suggested-by: Matthew Wilcox Signed-off-by: Alex Chiang Reported-by: Randy Dunlap Acked-by: Randy Dunlap --- -- 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/acpi/Kconfig b/drivers/acpi/Kconfig index 431f8b4..7ec7d88 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -266,6 +266,7 @@ config ACPI_DEBUG_FUNC_TRACE config ACPI_PCI_SLOT tristate "PCI slot detection driver" + depends on SYSFS default n help This driver creates entries in /sys/bus/pci/slots/ for all PCI diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index ba6af16..ed32f67 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -2,10 +2,11 @@ # Makefile for the PCI bus specific drivers. # -obj-y += access.o bus.o probe.o remove.o pci.o quirks.o slot.o \ +obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \ irq.o obj-$(CONFIG_PROC_FS) += proc.o +obj-$(CONFIG_SYSFS) += slot.o # Build PCI Express stuff if needed obj-$(CONFIG_PCIEPORTBUS) += pcie/ diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 9aa4fe1..522c360 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -4,7 +4,7 @@ menuconfig HOTPLUG_PCI tristate "Support for PCI Hotplug" - depends on PCI && HOTPLUG + depends on PCI && HOTPLUG && SYSFS ---help--- Say Y here if you have a motherboard with a PCI Hotplug controller. This allows you to add and remove PCI cards while the machine is