hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

watchdog: xen: use time64_t for timeouts 

The Xen watchdog driver uses __kernel_time_t and ktime_to_timespec()
internally for managing its timeouts. Both are deprecated because of
y2038 problems. The driver itself is fine, since it only uses monotonic
times, but converting it to use ktime_get_seconds() avoids the deprecated
interfaces and is slightly simpler.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Arnd Bergmann 2017-10-19 17:05:48 +02:00 committed by Wim Van Sebroeck
parent fb484262f9
commit b6c84c9ff3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/watchdog/xen_wdt.c
View File

@ -35,7 +35,7 @@
static struct platform_device *platform_device; static struct platform_device *platform_device;
static DEFINE_SPINLOCK(wdt_lock); static DEFINE_SPINLOCK(wdt_lock);
static struct sched_watchdog wdt; static struct sched_watchdog wdt;
static __kernel_time_t wdt_expires; static time64_t wdt_expires;
static bool is_active, expect_release; static bool is_active, expect_release;
#define WATCHDOG_TIMEOUT 60 /* in seconds */ #define WATCHDOG_TIMEOUT 60 /* in seconds */
@ -49,15 +49,15 @@ module_param(nowayout, bool, S_IRUGO);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
static inline __kernel_time_t set_timeout(void) static inline time64_t set_timeout(void)
{ {
wdt.timeout = timeout; wdt.timeout = timeout;
return ktime_to_timespec(ktime_get()).tv_sec + timeout; return ktime_get_seconds() + timeout;
} }
static int xen_wdt_start(void) static int xen_wdt_start(void)
{ {
__kernel_time_t expires; time64_t expires;
int err; int err;
spin_lock(&wdt_lock); spin_lock(&wdt_lock);
@ -98,7 +98,7 @@ static int xen_wdt_stop(void)
static int xen_wdt_kick(void) static int xen_wdt_kick(void)
{ {
__kernel_time_t expires; time64_t expires;
int err; int err;
spin_lock(&wdt_lock); spin_lock(&wdt_lock);
@ -222,7 +222,7 @@ static long xen_wdt_ioctl(struct file *file, unsigned int cmd,
return put_user(timeout, argp); return put_user(timeout, argp);
case WDIOC_GETTIMELEFT: case WDIOC_GETTIMELEFT:
retval = wdt_expires - ktime_to_timespec(ktime_get()).tv_sec; retval = wdt_expires - ktime_get_seconds();
return put_user(retval, argp); return put_user(retval, argp);
} }