]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
sound: oss: avoid time_t usage
authorArnd Bergmann <arnd@arndb.de>
Fri, 17 Jun 2016 14:30:03 +0000 (16:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 17 Jun 2016 14:31:19 +0000 (16:31 +0200)
We want to remove all time_t users from the kernel because of
y2038 compatibility. This particular instance does not even
use time_t to store a seconds value, so we can simply use
'unsigned int', which seems more fitting anywhere.

The same code is used in two OSS files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/oss/sound_timer.c
sound/oss/sys_timer.c

index 8021c85f076d09aa1c118473607e67219b04fc16..3a444a6f10ebc3d022aacea076eef5a7f81d4f9d 100644 (file)
@@ -17,7 +17,7 @@
 #include "sound_config.h"
 
 static volatile int initialized, opened, tmr_running;
-static volatile time_t tmr_offs, tmr_ctr;
+static volatile unsigned int tmr_offs, tmr_ctr;
 static volatile unsigned long ticks_offs;
 static volatile int curr_tempo, curr_timebase;
 static volatile unsigned long curr_ticks;
index 2226dda0eff0d9e2daf3f907877f20930f4f57ff..d17019d25b994526251a7fc8d9b088b0fecc109c 100644 (file)
@@ -19,7 +19,7 @@
 #include "sound_config.h"
 
 static volatile int opened, tmr_running;
-static volatile time_t tmr_offs, tmr_ctr;
+static volatile unsigned int tmr_offs, tmr_ctr;
 static volatile unsigned long ticks_offs;
 static volatile int curr_tempo, curr_timebase;
 static volatile unsigned long curr_ticks;