| Message ID | 20230722202548.24746-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | um/drivers: Kconfig: fix hostaudio build errors | expand |
On Sun, Jul 23, 2023 at 5:25 AM Randy Dunlap <rdunlap@infradead.org> wrote: > > Use "select"s to ensure that the required kconfig symbols are set > as expected. > > This fixes build errors when CONFIG_SOUND is not set. > > ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_cleanup_module': > hostaudio_kern.c:(.exit.text+0xa): undefined reference to `unregister_sound_mixer' > ld: hostaudio_kern.c:(.exit.text+0x15): undefined reference to `unregister_sound_dsp' > ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_init_module': > hostaudio_kern.c:(.init.text+0x19): undefined reference to `register_sound_dsp' > ld: hostaudio_kern.c:(.init.text+0x31): undefined reference to `register_sound_mixer' > ld: hostaudio_kern.c:(.init.text+0x49): undefined reference to `unregister_sound_dsp' > > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") > Fixes: d886e87cb82b ("sound: make OSS sound core optional") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Reported-by: kernel test robot <lkp@intel.com> > Link: lore.kernel.org/r/202307141416.vxuRVpFv-lkp@intel.com > Cc: Richard Weinberger <richard@nod.at> > Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> > Cc: Johannes Berg <johannes@sipsolutions.net> > Cc: linux-um@lists.infradead.org > Cc: Tejun Heo <tj@kernel.org> > Cc: Takashi Iwai <tiwai@suse.de> > Cc: Jaroslav Kysela <perex@perex.cz> > Cc: Masahiro Yamada <masahiroy@kernel.org> > Cc: Nathan Chancellor <nathan@kernel.org> > Cc: Nick Desaulniers <ndesaulniers@google.com> > Cc: Nicolas Schier <nicolas@fjasle.eu> > Cc: linux-kbuild@vger.kernel.org > --- > arch/um/drivers/Kconfig | 15 +++------------ > 1 file changed, 3 insertions(+), 12 deletions(-) > > diff -- a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig > --- a/arch/um/drivers/Kconfig > +++ b/arch/um/drivers/Kconfig > @@ -111,24 +111,15 @@ config SSL_CHAN > > config UML_SOUND > tristate "Sound support" > + select SOUND > + select SOUND_OSS_CORE > + select HOSTAUDIO > help > This option enables UML sound support. If enabled, it will pull in > soundcore and the UML hostaudio relay, which acts as a intermediary > between the host's dsp and mixer devices and the UML sound system. > It is safe to say 'Y' here. > > -config SOUND > - tristate > - default UML_SOUND > - > -config SOUND_OSS_CORE > - bool > - default UML_SOUND Yeah, these two should be removed because they exist in sound/Kconfig. > - > -config HOSTAUDIO > - tristate > - default UML_SOUND You need to keep this, otherwise there is no entry anywhere. > - > endmenu > > menu "UML Network Devices" -- Best Regards Masahiro Yamada
diff -- a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig --- a/arch/um/drivers/Kconfig +++ b/arch/um/drivers/Kconfig @@ -111,24 +111,15 @@ config SSL_CHAN config UML_SOUND tristate "Sound support" + select SOUND + select SOUND_OSS_CORE + select HOSTAUDIO help This option enables UML sound support. If enabled, it will pull in soundcore and the UML hostaudio relay, which acts as a intermediary between the host's dsp and mixer devices and the UML sound system. It is safe to say 'Y' here. -config SOUND - tristate - default UML_SOUND - -config SOUND_OSS_CORE - bool - default UML_SOUND - -config HOSTAUDIO - tristate - default UML_SOUND - endmenu menu "UML Network Devices"
Use "select"s to ensure that the required kconfig symbols are set as expected. This fixes build errors when CONFIG_SOUND is not set. ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_cleanup_module': hostaudio_kern.c:(.exit.text+0xa): undefined reference to `unregister_sound_mixer' ld: hostaudio_kern.c:(.exit.text+0x15): undefined reference to `unregister_sound_dsp' ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_init_module': hostaudio_kern.c:(.init.text+0x19): undefined reference to `register_sound_dsp' ld: hostaudio_kern.c:(.init.text+0x31): undefined reference to `register_sound_mixer' ld: hostaudio_kern.c:(.init.text+0x49): undefined reference to `unregister_sound_dsp' Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Fixes: d886e87cb82b ("sound: make OSS sound core optional") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: kernel test robot <lkp@intel.com> Link: lore.kernel.org/r/202307141416.vxuRVpFv-lkp@intel.com Cc: Richard Weinberger <richard@nod.at> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: linux-um@lists.infradead.org Cc: Tejun Heo <tj@kernel.org> Cc: Takashi Iwai <tiwai@suse.de> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Nathan Chancellor <nathan@kernel.org> Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Nicolas Schier <nicolas@fjasle.eu> Cc: linux-kbuild@vger.kernel.org --- arch/um/drivers/Kconfig | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)