On Saturday, January 15, 2011, Stephen Rothwell wrote:
> Hi Raphael,
>
> On Sat, 15 Jan 2011 14:19:16 +0100 "Rafael J. Wysocki" <rjw@xxxxxxx> wrote:
> >
> > 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.
>
> That fixes the compile error for my powerpc allyesconfig build.
> And my x86_64 allmodconfig and i386 defconfig builds still work.
Cool, thanks.
It goes again below, with a changelog.
Thanks,
Rafael
---
From: Rafael J. Wysocki <rjw@xxxxxxx>
Subject: PCI / ACPI: Fix build of the AER driver for !CONFIG_ACPI
After commit 415e12b (PCI/ACPI: Request _OSC control once for each
root bridge (v3)) include/linux/pci-acpi.h is included by
drivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the
bogus and unnecessary alternative definition of
acpi_find_root_bridge_handle() causes a build error to occur.
Remove the offending piece of garbage.
Reported-and-tested-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
---
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
