summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2014-07-23 14:35:39 -0700
committerJohn Stultz <john.stultz@linaro.org>2014-07-23 15:01:56 -0700
commite2dff1ec0cc81fcf3e0696604bacc3e1c816538c (patch)
tree38b1205e24ec8b89ac7aae56c669f1efd2426132 /kernel
parent1b3e5c0936046e7e023149ddc8946d21c2ea20eb (diff)
downloadlinux-e2dff1ec0cc81fcf3e0696604bacc3e1c816538c.tar.gz
linux-e2dff1ec0cc81fcf3e0696604bacc3e1c816538c.tar.bz2
linux-e2dff1ec0cc81fcf3e0696604bacc3e1c816538c.zip
timekeeping: Minor fixup for timespec64->timespec assignment
In the GENERIC_TIME_VSYSCALL_OLD update_vsyscall implementation, we take the tk_xtime() value, which returns a timespec64, and store it in a timespec. This luckily is ok, since the only architectures that use GENERIC_TIME_VSYSCALL_OLD are ia64 and ppc64, which are both 64 bit systems where timespec64 is the same as a timespec. Even so, for cleanliness reasons, use the conversion function to assign the proper type. Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/timekeeping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 8980fb722fc5..2b56b959615b 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -338,7 +338,7 @@ static inline void update_vsyscall(struct timekeeper *tk)
{
struct timespec xt;
- xt = tk_xtime(tk);
+ xt = timespec64_to_timespec(tk_xtime(tk));
update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->tkr.clock, tk->tkr.mult,
tk->tkr.cycle_last);
}