-tip: origin tree build failure
Ingo Molnar
AppliedToday'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.
Thanks,
Ingo
drivers/char/ipmi/ipmi_si_intf.c +2 -2
@@ -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
Quoted 14 lines · Ingo Molnar
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, forCONFIG_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 oncedrivers/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_driverdepends on ACPI facilities and is only made available under ACPI - while the registration and unregistration is made dependent onCONFIG_PNP:
Quoted 7 lines
#ifdef
CONFIG_PNP
pnp_register_driver(&ipmi_pnp_driver);
#endifThe solution is to only register this driver under ACPI. (Also, the
CONFIG_PNPdependency is not needed becausepnp_register_driver()is stubbed out in the !CONFIG_PNP case.)
Yes, sorry we missed this case.
Quoted 2 lines
I've applied the patch below to tip:out-of-tree for now.
Looks good to us. Thanks!
Myron
Quoted 30 lines
Thanks,
Ingo
Signed-off-by Ingo Molnar <[email protected]>drivers/char/ipmi/ipmi_si_intf.c +2
-2@@ -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
Signature · 1 line
Myron Stowe HP Open Source Linux Lab (OSLL)
Quoted 18 lines · Ingo Molnar
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, forCONFIG_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 oncedrivers/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_driverdepends on ACPI facilities and is only made available under ACPI - while the registration and unregistration is made dependent onCONFIG_PNP:#ifdef
CONFIG_PNP
pnp_register_driver(&ipmi_pnp_driver);
#endif
Quoted 5 lines
The solution is to only register this driver under ACPI. (Also, the
CONFIG_PNPdependency is not needed becausepnp_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!
Quoted 20 lines
Thanks,
Ingo
Signed-off-by Ingo Molnar <[email protected]>drivers/char/ipmi/ipmi_si_intf.c +1
-1@@ -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
drivers/char/ipmi/ipmi_si_intf.c static __exit void cleanup_ipmi_si(void) · line 3336
Quoted 8 lines
drivers/char/ipmi/ipmi_si_intf.c +1
-1@@ -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 -- [email protected]
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
...
Quoted 3 lines
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 static __devinit int init_ipmi_si(void) · line 3209
Quoted 4 lines
drivers/char/ipmi/ipmi_si_intf.c +1
-1-#ifdef CONFIG_PNP +#ifdef CONFIG_ACPI pnp_register_driver (&ipmi_pnp_driver);#endif
...
Hi Ingo,
As my tree inflicted this one and I don't see your patch upstream, I'll include your fix with my "for -rc2" push.
thanks,
-Len Brown, Intel Open Source Technology Center
Quoted 2 lines · Len Brown
As my tree inflicted this one and I don't see your patch upstream, I'll include your fix with my "for -rc2" push.
I will be sending you an alternate patch in a few minutes, anyway. If you already sent the pull request, just let me know as that means I need to adjust my tree.
Instead of depending on ALSA, I made the entire feature that depends on ALSA optional.
Signature · 4 lines
"One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh
Quoted 12 lines · Len Brown
...
Quoted 3 lines
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)...
Quoted 4 lines
drivers/char/ipmi/ipmi_si_intf.c +1
-1-#ifdef CONFIG_PNP +#ifdef CONFIG_ACPI pnp_register_driver (&ipmi_pnp_driver);#endif ...
Quoted 3 lines
Hi Ingo,
As my tree inflicted this one and I don't see your patch upstream, I'll include your fix with my "for -rc2" push.
Thanks!
Ingo