On Saturday, January 15, 2011, Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > In file included from drivers/pci/pcie/aer/aerdrv.c:20: > include/linux/pci-acpi.h:39: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'acpi_find_root_bridge_handle' > > Caused by commit 415e12b2379239973feab91850b0dce985c6058a ("PCI/ACPI: > Request _OSC control once for each root bridge (v3)"). (Yet another > patch not seen in linux-next until merged into Linus' tree. In this case > the breakage was not seen because the new part of the pci tree was > excluded from linux-next for several days because of another commit that > broke my builds. Ah. I thought it was in linux-next. :-( > That other commit was only excluded from the pci tree > just before being sent to Linus :-() > > This is the non CONFIG_ACPI version of acpi_find_root_bridge_handle() > which returns an acpi_handle. pci-acpi.h is now always included in > drivers/pci/pcie/aer/aerdrv.c. > > I tried ifef'ing out the inclusion of pci-acpi.h, but that only made > matters worse. I have just left it for today. Please fix. It looks like the non-CONFIG_ACPI version of acpi_find_root_bridge_handle() is just not necessary any more, because acpi_find_root_bridge_handle() is only used in code that depends on CONFIG_ACPI. A patch removing it is appended, please test. Thanks, Rafael --- include/linux/pci-acpi.h | 3 --- 1 file changed, 3 deletions(-) Index: linux-2.6/include/linux/pci-acpi.h =================================================================== --- linux-2.6.orig/include/linux/pci-acpi.h +++ linux-2.6/include/linux/pci-acpi.h @@ -35,9 +35,6 @@ static inline acpi_handle acpi_pci_get_b return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), pbus->number); } -#else -static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) -{ return NULL; } #endif #ifdef CONFIG_ACPI_APEI -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html