timekeeping: Another fix to the VSYSCALL_OLD update_vsyscall

Benjamin Herrenschmidt pointed out that I further missed modifying
update_vsyscall after the wall_to_mono value was changed to a
timespec64.  This causes issues on powerpc32, which expects a 32bit
timespec.

This patch fixes the problem by properly converting from a timespec64 to
a timespec before passing the value on to the arch-specific vsyscall
logic.

[ Thomas is currently on vacation, but reviewed it and wanted me to send
  this fix on to you directly. ]

Cc: LKML <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Reported-by: Benjamin Herrenschmidt <[email protected]>
Reviewed-by: Thomas Gleixner <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index f36b02838a4772a7ddaf4064e95a27ab22a6de3f..fb4a9c2cf8d98db2256a6268fb8bbfb37673b2fe 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -338,10 +338,11 @@ EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);
 
 static inline void update_vsyscall(struct timekeeper *tk)
 {
-       struct timespec xt;
+       struct timespec xt, wm;
 
        xt = timespec64_to_timespec(tk_xtime(tk));
-       update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->tkr.clock, tk->tkr.mult,
+       wm = timespec64_to_timespec(tk->wall_to_monotonic);
+       update_vsyscall_old(&xt, &wm, tk->tkr.clock, tk->tkr.mult,
                            tk->tkr.cycle_last);
 }