On Fri, Jul 28, 2023 at 1:30 PM Randy Dunlap <rdun...@infradead.org> wrote: > > Use "select"s to ensure that the required kconfig symbols are set > as expected. > Drop HOSTAUDIO since it is now equivalent to UML_SOUND. > > Allow SOUND with UML regardless of HAS_IOMEM. Otherwise there is a > kconfig warning for unmet dependencies. (This was not an issue when > SOUND was defined in arch/um/drivers/Kconfig. I have done 50 randconfig > builds and didn't find any issues.) > > 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' > > and this kconfig warning: > WARNING: unmet direct dependencies detected for SOUND > > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") > Fixes: d886e87cb82b ("sound: make OSS sound core optional") > Signed-off-by: Randy Dunlap <rdun...@infradead.org> > Reported-by: kernel test robot <l...@intel.com> > Link: lore.kernel.org/r/202307141416.vxurvpfv-...@intel.com > Cc: Richard Weinberger <rich...@nod.at> > Cc: Anton Ivanov <anton.iva...@cambridgegreys.com> > Cc: Johannes Berg <johan...@sipsolutions.net> > Cc: linux-um@lists.infradead.org > Cc: Tejun Heo <t...@kernel.org> > Cc: Takashi Iwai <ti...@suse.de> > Cc: Jaroslav Kysela <pe...@perex.cz> > Cc: Masahiro Yamada <masahi...@kernel.org> > Cc: Nathan Chancellor <nat...@kernel.org> > Cc: Nick Desaulniers <ndesaulni...@google.com> > Cc: Nicolas Schier <nico...@fjasle.eu> > Cc: linux-kbu...@vger.kernel.org > Cc: alsa-de...@alsa-project.org > --- > v2: don't delete the HOSTAUDIO Kconfig entry (Masahiro) > v3: drop HOSTAUDIO and use CONFIG_UML_SOUND for it in Makefile (Takashi); > add SOUND depends on "|| UML" to HAS_IOMEM > > arch/um/drivers/Kconfig | 14 ++------------ > arch/um/drivers/Makefile | 2 +- > sound/Kconfig | 2 +- > 3 files changed, 4 insertions(+), 14 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,14 @@ config SSL_CHAN > > config UML_SOUND > tristate "Sound support" > + select SOUND
This would be the only instance that select's SOUND. Perhaps, this could be 'depends on SOUND'. (in that case, arch/um/configs/*_defconfig needs modification). Just my two cents. Reviewed-by: Masahiro Yamada <masahi...@kernel.org> -- Best Regards Masahiro Yamada _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um