Messages in this thread | | | Date | Sat, 26 Dec 2009 13:36:14 +0100 | Subject | Re: -tip: origin tree build failure | From | Geert Uytterhoeven <> |
| |
On Thu, Dec 17, 2009 at 08:50, Ingo Molnar <mingo@elte.hu> wrote: > Today's -tip failed to build because commit > 9e368fa011d4e0aa050db348d69514900520e40b ("ipmi: add PNP discovery (ACPI > namespace via PNPACPI)") from today's upstream kernel causes the following > build failure on x86, for CONFIG_ACPI=n && CONFIG_IPMI_SI=y: > > drivers/char/ipmi/ipmi_si_intf.c:3208: error: 'ipmi_pnp_driver' undeclared (first use in this function) > drivers/char/ipmi/ipmi_si_intf.c:3208: error: (Each undeclared identifier is reported only once > drivers/char/ipmi/ipmi_si_intf.c:3208: error: for each function it appears in.) > drivers/char/ipmi/ipmi_si_intf.c:3334: error: 'ipmi_pnp_driver' undeclared (first use in this function) > > The reason is that the ipmi_pnp_driver depends on ACPI facilities and is only > made available under ACPI - while the registration and unregistration is made > dependent on CONFIG_PNP: > > #ifdef CONFIG_PNP > pnp_register_driver(&ipmi_pnp_driver); > #endif > > The solution is to only register this driver under ACPI. (Also, the CONFIG_PNP > dependency is not needed because pnp_register_driver() is stubbed out in the > !CONFIG_PNP case.) > > I've applied the patch below to tip:out-of-tree for now.
Any chance we can see this fixed in mainline soon, so allmodconfig builds again on non-ACPI platforms? Thx!
> Thanks, > > Ingo > > Signed-off-by: Ingo Molnar <mingo@elte.hu> > > diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c > index 679cd08..176f175 100644 > --- a/drivers/char/ipmi/ipmi_si_intf.c > +++ b/drivers/char/ipmi/ipmi_si_intf.c > @@ -3204,7 +3204,7 @@ static __devinit int init_ipmi_si(void) > #ifdef CONFIG_ACPI > spmi_find_bmc(); > #endif > -#ifdef CONFIG_PNP > +#ifdef CONFIG_ACPI > pnp_register_driver(&ipmi_pnp_driver); > #endif > > @@ -3330,7 +3330,7 @@ static __exit void cleanup_ipmi_si(void) > #ifdef CONFIG_PCI > pci_unregister_driver(&ipmi_pci_driver); > #endif > -#ifdef CONFIG_PNP > +#ifdef CONFIG_ACPI > pnp_unregister_driver(&ipmi_pnp_driver); > #endif >
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |