Re: linux-next: build failure after merge of the final tree (pci-current tree related)

[Rafael J. Wysocki]

On Wednesday, August 25, 2010, Stephen Rothwell wrote:
> Hi Jesse,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/pci/hotplug/pciehp_core.c: In function 'pciehp_probe':
> drivers/pci/hotplug/pciehp_core.c:238: error: implicit declaration of function 'pciehp_acpi_slot_detection_check'
> 
> Caused by commit 28eb5f274a305bf3a13b2c80c4804d4515d05c64 ("PCI: PCIe:
> Ask BIOS for control of all native services at once").  This function is
> only declared if CONFIG_ACPI is defined.
> 
> I have reverted that commit for today (and the two that interact with it:
> 2bd50dd800b52245294cfceb56be62020cdc7515 "PCI: PCIe: Disable PCIe port
> services during port initialization" and
> 271fb719cc472af3b1e96d8c527bb0da7060a172 "PCI: PCIe: Move PCIe PME code
> to the pcie directory").

Sorry, my bad.

The patch below should fix this issue.

Thanks,
Rafael

---
From: Rafael J. Wysocki <rjw@xxxxxxx>
Subject: PCI / hot-plug: Fix build with CONFIG_ACPI unset

One of the recent changes caused complilation of
drivers/pci/hotplug/pciehp_core.c to fail.  Fix this issue.

Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
---
 drivers/pci/hotplug/pciehp.h |    4 ++++
 1 file changed, 4 insertions(+)

Index: linux-2.6/drivers/pci/hotplug/pciehp.h
===================================================================
--- linux-2.6.orig/drivers/pci/hotplug/pciehp.h
+++ linux-2.6/drivers/pci/hotplug/pciehp.h
@@ -178,5 +178,9 @@ static inline void pciehp_firmware_init(
 }
 #else
 #define pciehp_firmware_init()				do {} while (0)
+static inline int pciehp_acpi_slot_detection_check(struct pci_dev *dev)
+{
+	return 0;
+}
 #endif 				/* CONFIG_ACPI */
 #endif				/* _PCIEHP_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/