From patchwork Mon Jun 29 08:07:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo Molnar X-Patchwork-Id: 32900 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 n5T88ZbW022163 for ; Mon, 29 Jun 2009 08:08:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754323AbZF2IIa (ORCPT ); Mon, 29 Jun 2009 04:08:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753841AbZF2IIa (ORCPT ); Mon, 29 Jun 2009 04:08:30 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:60269 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753245AbZF2II2 (ORCPT ); Mon, 29 Jun 2009 04:08:28 -0400 Received: from elvis.elte.hu ([157.181.1.14]) by mx3.mail.elte.hu with esmtp (Exim) id 1MLBu9-0007uN-LA from ; Mon, 29 Jun 2009 10:08:03 +0200 Received: by elvis.elte.hu (Postfix, from userid 1004) id 5D2C83E22C6; Mon, 29 Jun 2009 10:07:51 +0200 (CEST) Date: Mon, 29 Jun 2009 10:07:54 +0200 From: Ingo Molnar To: Len Brown , Corentin Chary , Randy Dunlap , Matthew Garrett Cc: Linus Torvalds , Andrew Morton , Linux Kernel Mailing List , linux-acpi@vger.kernel.org Subject: [PATCH] eeepc-laptop: Fix build failure with HOTPLUG_PCI && !SYSFS (was: [git pull request] ACPI & driver patches for 2.6.31-rc1) Message-ID: <20090629080754.GA28336@elte.hu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) Received-SPF: neutral (mx3: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@elte.hu; helo=elvis.elte.hu; X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org FYI, there's a post-rc1 build regression with certain configs: drivers/built-in.o: In function `pci_hp_deregister': (.text+0xb166): undefined reference to `pci_hp_remove_module_link' drivers/built-in.o: In function `pci_hp_deregister': (.text+0xb19f): undefined reference to `pci_destroy_slot' drivers/built-in.o: In function `__pci_hp_register': (.text+0xb583): undefined reference to `pci_create_slot' drivers/built-in.o: In function `__pci_hp_register': (.text+0xb5b1): undefined reference to `pci_hp_create_module_link' make: *** [.tmp_vmlinux1] Error 1 Caused by: | 2b121bc262fa03c94e653b2d44356c2f86c1bcdc is first bad commit | commit 2b121bc262fa03c94e653b2d44356c2f86c1bcdc | Date: Thu Jun 25 13:25:36 2009 +0200 | | eeepc-laptop: Register as a pci-hotplug device The problem is caused by this portion of the commit: the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -357,6 +357,8 @@ config EEEPC_LAPTOP depends on RFKILL || RFKILL = n select BACKLIGHT_CLASS_DEVICE select HWMON + select HOTPLUG + select HOTPLUG_PCI if PCI ---help--- This driver supports the Fn-Fx keys on Eee PC laptops. We never select CONFIG_HOTPLUG_PCI, as it is a non-trivial, interactive, many-child-dependencies configuration option. The select caused partial dependencies to be instantiated by the Kconfig language, and allowed the PCI hotplug core code to be built without SYSFS - so drivers/pci/slot.c wasnt built but was being relied on. The complexity of select statements is already a warning sign that something unusual is done here. They should be avoided generally, except for clear-cut 'leaf' modules. The patch below fixes the build failure by turning the select lines into a single 'depends on' line. There's no significant reduction in utility of the driver: it already has a list of dependencies, and basically all distros enable hotplug-pci anyway. Ingo Signed-off-by: Ingo Molnar diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index fee6a40..46dad12 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -355,10 +355,9 @@ config EEEPC_LAPTOP depends on INPUT depends on EXPERIMENTAL depends on RFKILL || RFKILL = n + depends on HOTPLUG_PCI select BACKLIGHT_CLASS_DEVICE select HWMON - select HOTPLUG - select HOTPLUG_PCI if PCI ---help--- This driver supports the Fn-Fx keys on Eee PC laptops. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in