projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-4.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[linux-2.6-microblaze.git]
/
kernel
/
time
/
ntp.c
diff --git
a/kernel/time/ntp.c
b/kernel/time/ntp.c
index
6df8927
..
edf19cc
100644
(file)
--- a/
kernel/time/ntp.c
+++ b/
kernel/time/ntp.c
@@
-381,7
+381,7
@@
ktime_t ntp_get_next_leap(void)
if ((time_state == TIME_INS) && (time_status & STA_INS))
return ktime_set(ntp_next_leap_sec, 0);
- ret
.tv64
= KTIME_MAX;
+ ret = KTIME_MAX;
return ret;
}