* linux-next: build failure after merge of the final tree (pci-current tree related)
@ 2010-08-25 1:56 Stephen Rothwell
2010-08-25 19:33 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-08-25 1:56 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 879 bytes --]
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").
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: build failure after merge of the final tree (pci-current tree related)
2010-08-25 1:56 linux-next: build failure after merge of the final tree (pci-current tree related) Stephen Rothwell
@ 2010-08-25 19:33 ` Rafael J. Wysocki
2010-08-25 19:54 ` Jesse Barnes
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2010-08-25 19:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jesse Barnes, linux-next, linux-kernel
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@sisk•pl>
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@sisk•pl>
---
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 */
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: build failure after merge of the final tree (pci-current tree related)
2010-08-25 19:33 ` Rafael J. Wysocki
@ 2010-08-25 19:54 ` Jesse Barnes
0 siblings, 0 replies; 3+ messages in thread
From: Jesse Barnes @ 2010-08-25 19:54 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Stephen Rothwell, linux-next, linux-kernel
On Wed, 25 Aug 2010 21:33:29 +0200
"Rafael J. Wysocki" <rjw@sisk•pl> wrote:
> 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@sisk•pl>
Fix pushed out to my for-linus branch, thanks guys.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-25 19:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-25 1:56 linux-next: build failure after merge of the final tree (pci-current tree related) Stephen Rothwell
2010-08-25 19:33 ` Rafael J. Wysocki
2010-08-25 19:54 ` Jesse Barnes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox