On Tue, Nov 12, 2019 at 4:18 PM Arnd Bergmann arnd@arndb.de wrote:
Co-developed-with: Baolin Wang baolin.wang@linaro.org Signed-off-by: Baolin Wang baolin.wang@linaro.org Signed-off-by: Arnd Bergmann arnd@arndb.de
include/uapi/sound/asound.h | 106 ++++++++++++++++++++++++++++++++---- sound/core/pcm_compat.c | 30 +++++----- sound/core/pcm_lib.c | 10 ++-- sound/core/pcm_native.c | 39 ++++++++----- 4 files changed, 143 insertions(+), 42 deletions(-)
I found one more use of 'struct timespec' remaining in there, and have amended this patch with a small change now to hide that as well.
Arnd
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index c5d8e7f134d0..e6a958b8aff1 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -502,7 +502,11 @@ struct snd_pcm_status { #define __snd_pcm_mmap_status64 snd_pcm_mmap_status #define __snd_pcm_mmap_control64 snd_pcm_mmap_control #define __snd_pcm_sync_ptr64 snd_pcm_sync_ptr +#ifdef __KERNEL__ +#define __snd_timespec64 __kernel_timespec +#else #define __snd_timespec64 timespec +#endif struct __snd_timespec { __s32 tv_sec; __s32 tv_nsec;