diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-10-13 14:34:35 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-17 11:22:28 -0400 |
commit | 4eb1bca1793385b8caff4b2e1f19b31a013dd1ec (patch) | |
tree | fc199123fe67460de60b4ef9470fdd4f9b03c86b | |
parent | fe460423438b62eb7440d994ab19a9f444e6280d (diff) |
time: Use do_settimeofday64() internally
do_settimeofday() is a wrapper around do_settimeofday64(), so that function
can be called directly. The wrapper can be removed once the last user is
gone.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: y2038@lists.linaro.org
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Deepa Dinamani <deepa.kernel@gmail.com>
Link: https://lkml.kernel.org/r/20171013183452.3635956-1-arnd@arndb.de
-rw-r--r-- | kernel/time/time.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/time/time.c b/kernel/time/time.c index 44a8c1402133..cfe3d3e4679f 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c | |||
@@ -82,7 +82,7 @@ SYSCALL_DEFINE1(time, time_t __user *, tloc) | |||
82 | 82 | ||
83 | SYSCALL_DEFINE1(stime, time_t __user *, tptr) | 83 | SYSCALL_DEFINE1(stime, time_t __user *, tptr) |
84 | { | 84 | { |
85 | struct timespec tv; | 85 | struct timespec64 tv; |
86 | int err; | 86 | int err; |
87 | 87 | ||
88 | if (get_user(tv.tv_sec, tptr)) | 88 | if (get_user(tv.tv_sec, tptr)) |
@@ -90,11 +90,11 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr) | |||
90 | 90 | ||
91 | tv.tv_nsec = 0; | 91 | tv.tv_nsec = 0; |
92 | 92 | ||
93 | err = security_settime(&tv, NULL); | 93 | err = security_settime64(&tv, NULL); |
94 | if (err) | 94 | if (err) |
95 | return err; | 95 | return err; |
96 | 96 | ||
97 | do_settimeofday(&tv); | 97 | do_settimeofday64(&tv); |
98 | return 0; | 98 | return 0; |
99 | } | 99 | } |
100 | 100 | ||
@@ -122,7 +122,7 @@ COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc) | |||
122 | 122 | ||
123 | COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr) | 123 | COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr) |
124 | { | 124 | { |
125 | struct timespec tv; | 125 | struct timespec64 tv; |
126 | int err; | 126 | int err; |
127 | 127 | ||
128 | if (get_user(tv.tv_sec, tptr)) | 128 | if (get_user(tv.tv_sec, tptr)) |
@@ -130,11 +130,11 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr) | |||
130 | 130 | ||
131 | tv.tv_nsec = 0; | 131 | tv.tv_nsec = 0; |
132 | 132 | ||
133 | err = security_settime(&tv, NULL); | 133 | err = security_settime64(&tv, NULL); |
134 | if (err) | 134 | if (err) |
135 | return err; | 135 | return err; |
136 | 136 | ||
137 | do_settimeofday(&tv); | 137 | do_settimeofday64(&tv); |
138 | return 0; | 138 | return 0; |
139 | } | 139 | } |
140 | 140 | ||