diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 16:02:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 16:02:18 -0700 |
| commit | b82b6813ff8fd741c3061c4a754ded898b69ab28 (patch) | |
| tree | 0f50a5a8ac27522a4b4a08a0427a75fce5716604 | |
| parent | 8837c70d531a1788f975c366c254a5cb973a5291 (diff) | |
| parent | 3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24 (diff) | |
| download | linux-b82b6813ff8fd741c3061c4a754ded898b69ab28.tar.bz2 | |
Merge tag 'nios2-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull nios2 update from Ley Foon Tan:
"Use read_persistent_clock64() instead of read_persistent_clock()"
* tag 'nios2-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
nios2: Use read_persistent_clock64() instead of read_persistent_clock()
| -rw-r--r-- | arch/nios2/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c index 20e86209ef2e..ab88b6dd4679 100644 --- a/arch/nios2/kernel/time.c +++ b/arch/nios2/kernel/time.c @@ -336,9 +336,9 @@ static int __init nios2_time_init(struct device_node *timer) return ret; } -void read_persistent_clock(struct timespec *ts) +void read_persistent_clock64(struct timespec64 *ts) { - ts->tv_sec = mktime(2007, 1, 1, 0, 0, 0); + ts->tv_sec = mktime64(2007, 1, 1, 0, 0, 0); ts->tv_nsec = 0; } |