On Wed, Jun 5, 2013 at 2:10 PM, Greg KH <[email protected]> wrote: > On Wed, Jun 05, 2013 at 12:52:37PM -0600, Bjorn Helgaas wrote: >> On Sun, May 26, 2013 at 08:54:10AM +0900, [email protected] wrote: >> > >> > The patch below does not apply to the 3.9-stable tree. >> > If someone wants it applied there, or to any other stable or longterm >> > tree, then please email the backport, including the original git commit >> > id to <[email protected]>. >> >> Here's the v3.9 backport: > > It breaks the build :( > > drivers/pci/hotplug/acpiphp_glue.c:1125:6: error: redefinition of > ‘acpiphp_check_host_bridge’ > In file included from drivers/pci/hotplug/acpiphp_glue.c:48:0: > include/linux/pci-acpi.h:49:20: note: previous definition of > ‘acpiphp_check_host_bridge’ was here > > Let me see if it's a simple fix... > > Nope, I don't understand it, care to fix this up and resend it?
Huh, it builds fine for me, both with and without CONFIG_HOTPLUG_PCI_ACPI=y. Maybe the include/linux/pci-acpi.h hunk of the patch didn't get applied correctly? We should only compile acpiphp_glue.c when CONFIG_HOTPLUG_PCI_ACPI=y, and the empty inline version of acpiphp_check_host_bridge() in pci-acpi.h should be #ifdeffed so it's not compiled when CONFIG_HOTPLUG_PCI_ACPI=y. Yinghai, feel free to jump in here anytime; this is your patch, and I was just trying to do you a favor by following up on this. Bjorn -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
