To match struct __snd_pcm_mmap_status and enable reuse of
snd_pcm_sync_ptr_get_user() and snd_pcm_sync_ptr_put_user() by
snd_pcm_sync_ptr() replace tstamp_sec and tstamp_nsec fields by
a struct __snd_timespec64 in struct snd_pcm_mmap_status_x32.
Do the same with audio_tstamp_sec and audio_tstamp_nsec.
This is possible because struct snd_pcm_mmap_status_x32 is packed
and __SND_STRUCT_TIME64 is always defined for kernel which means
struct __snd_timespec64 is always defined as struct __kernel_timespec
which is:
struct __kernel_timespec {
long long tv_sec;
long long tv_nsec;
};
Reported-by: Stephen Rothwell <s...@canb.auug.org.au>
Fixes: a0f3992ee86e ("ALSA: pcm: Replace [audio_]tstamp_[n]sec by struct
__snd_timespec in struct snd_pcm_mmap_status32")
Closes: https://lore.kernel.org/all/20250616130126.08729...@canb.auug.org.au/
Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
Might be squashed with a0f3992ee86e if you happen to rebase sound tree.
---
sound/core/pcm_compat.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index 17540020ac2f..54eb9bd8eb21 100644
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -377,12 +377,10 @@ struct snd_pcm_mmap_status_x32 {
s32 pad1;
u32 hw_ptr;
u32 pad2; /* alignment */
- s64 tstamp_sec;
- s64 tstamp_nsec;
+ struct __snd_timespec64 tstamp;
snd_pcm_state_t suspended_state;
s32 pad3;
- s64 audio_tstamp_sec;
- s64 audio_tstamp_nsec;
+ struct __snd_timespec64 audio_tstamp;
} __packed;
struct snd_pcm_mmap_control_x32 {
--
2.47.0
