| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162 |
- From 41c029755502acf01ed634db437ac06d09be6c41 Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
- Date: Fri, 13 Apr 2018 09:02:37 +0200
- Subject: [PATCH] Don't use fork() on noMMU platforms
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
- [Jörg: update patch for 1.1.6]
- Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
- Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html
- [Bernd: update patch for 1.2.4 & 1.2.7]
- Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
- ---
- configure.ac | 2 ++
- src/pcm/pcm_direct.c | 10 +++++++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
- diff --git a/configure.ac b/configure.ac
- index cce195ae..0c852434 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -52,6 +52,8 @@ dnl Checks for library functions.
- AC_CHECK_FUNCS([uselocale])
- AC_CHECK_FUNCS([eaccess])
-
- +AC_CHECK_FUNC([fork])
- +
- SAVE_LIBRARY_VERSION
- AC_SUBST(LIBTOOL_VERSION_INFO)
-
- diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
- index 2b07eff9..4dc3ea26 100644
- --- a/src/pcm/pcm_direct.c
- +++ b/src/pcm/pcm_direct.c
- @@ -437,13 +437,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix)
- close(dmix->server_fd);
- return ret;
- }
- -
- +
- +#ifdef HAVE_FORK
- ret = fork();
- +#else
- + ret = vfork();
- +#endif
- if (ret < 0) {
- close(dmix->server_fd);
- return ret;
- } else if (ret == 0) {
- +#ifdef HAVE_FORK
- ret = fork();
- +#else
- + ret = vfork();
- +#endif
- if (ret == 0)
- server_job(dmix);
- _exit(EXIT_SUCCESS);
- --
- 2.14.3
|
