sound/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
When building for the UM arch and neither INDIRECT_IOMEM=y, nor
HAS_IOMEM=y is selected, it will fall back to the implementations from
asm-generic/io.h for IO memcpy. But these fall-back functions just do a
memcpy. So, instead of depending on UML, add dependency on 'HAS_IOMEM ||
INDIRECT_IOMEM'.
Acked-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Yann Sionneau <ysionneau@kalrayinc.com>
Signed-off-by: Julian Vetter <jvetter@kalrayinc.com>
---
sound/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/Kconfig b/sound/Kconfig
index 4c036a9a420a..8b40205394fe 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
menuconfig SOUND
tristate "Sound card support"
- depends on HAS_IOMEM || UML
+ depends on HAS_IOMEM || INDIRECT_IOMEM
help
If you have a sound card in your computer, i.e. if it can say more
than an occasional beep, say Y.
--
2.34.1
On Thu, 10 Oct 2024 14:46:01 +0200, Julian Vetter wrote: > > When building for the UM arch and neither INDIRECT_IOMEM=y, nor > HAS_IOMEM=y is selected, it will fall back to the implementations from > asm-generic/io.h for IO memcpy. But these fall-back functions just do a > memcpy. So, instead of depending on UML, add dependency on 'HAS_IOMEM || > INDIRECT_IOMEM'. > > Acked-by: Takashi Iwai <tiwai@suse.de> > Reviewed-by: Yann Sionneau <ysionneau@kalrayinc.com> > Signed-off-by: Julian Vetter <jvetter@kalrayinc.com> This is expected to be applied via sound.git tree? Then I'll happily take it. thanks, Takashi > --- > sound/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/Kconfig b/sound/Kconfig > index 4c036a9a420a..8b40205394fe 100644 > --- a/sound/Kconfig > +++ b/sound/Kconfig > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > menuconfig SOUND > tristate "Sound card support" > - depends on HAS_IOMEM || UML > + depends on HAS_IOMEM || INDIRECT_IOMEM > help > If you have a sound card in your computer, i.e. if it can say more > than an occasional beep, say Y. > -- > 2.34.1 > > > > >
On 10/10/24 16:12, Takashi Iwai wrote: > On Thu, 10 Oct 2024 14:46:01 +0200, > Julian Vetter wrote: >> >> When building for the UM arch and neither INDIRECT_IOMEM=y, nor >> HAS_IOMEM=y is selected, it will fall back to the implementations from >> asm-generic/io.h for IO memcpy. But these fall-back functions just do a >> memcpy. So, instead of depending on UML, add dependency on 'HAS_IOMEM || >> INDIRECT_IOMEM'. >> >> Acked-by: Takashi Iwai <tiwai@suse.de> >> Reviewed-by: Yann Sionneau <ysionneau@kalrayinc.com> >> Signed-off-by: Julian Vetter <jvetter@kalrayinc.com> > > This is expected to be applied via sound.git tree? Yes. At least I have abandoned this patch as part of my big patchset for the IO memcpy. Instead I try to integrate the different parts piece by piece in the different subsystems and archs. I thinks this is better, as suggested by Arnd. > Then I'll happily take it. > Thank you! > > thanks, > > Takashi > >> --- >> sound/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/sound/Kconfig b/sound/Kconfig >> index 4c036a9a420a..8b40205394fe 100644 >> --- a/sound/Kconfig >> +++ b/sound/Kconfig >> @@ -1,7 +1,7 @@ >> # SPDX-License-Identifier: GPL-2.0-only >> menuconfig SOUND >> tristate "Sound card support" >> - depends on HAS_IOMEM || UML >> + depends on HAS_IOMEM || INDIRECT_IOMEM >> help >> If you have a sound card in your computer, i.e. if it can say more >> than an occasional beep, say Y. >> -- >> 2.34.1 >> >> >> >> >> > > > >
On Thu, 10 Oct 2024 16:53:48 +0200, Julian Vetter wrote: > > > > On 10/10/24 16:12, Takashi Iwai wrote: > > On Thu, 10 Oct 2024 14:46:01 +0200, > > Julian Vetter wrote: > >> > >> When building for the UM arch and neither INDIRECT_IOMEM=y, nor > >> HAS_IOMEM=y is selected, it will fall back to the implementations from > >> asm-generic/io.h for IO memcpy. But these fall-back functions just do a > >> memcpy. So, instead of depending on UML, add dependency on 'HAS_IOMEM || > >> INDIRECT_IOMEM'. > >> > >> Acked-by: Takashi Iwai <tiwai@suse.de> > >> Reviewed-by: Yann Sionneau <ysionneau@kalrayinc.com> > >> Signed-off-by: Julian Vetter <jvetter@kalrayinc.com> > > > > This is expected to be applied via sound.git tree? > > Yes. At least I have abandoned this patch as part of my big patchset > for the IO memcpy. Instead I try to integrate the different parts > piece by piece in the different subsystems and archs. I thinks this is > better, as suggested by Arnd. OK, now applied to for-linus branch. thanks, Takashi
© 2016 - 2024 Red Hat, Inc.