| From b6f4296279ab3ada554d993d12844272fd86b36a Mon Sep 17 00:00:00 2001 |
| From: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| Date: Tue, 20 May 2014 17:21:35 +0200 |
| Subject: s390/time: cast tv_nsec to u64 prior to shift in update_vsyscall |
| |
| From: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| |
| commit b6f4296279ab3ada554d993d12844272fd86b36a upstream. |
| |
| Analog to git commit 28b92e09e25bdc0ae864b22eacf195a74f861389 |
| first cast tk->wall_to_monotonic.tv_nsec to u64 before doing |
| the shift with tk->shift to avoid loosing relevant bits on a |
| 32-bit kernel. |
| |
| Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/s390/kernel/time.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/s390/kernel/time.c |
| +++ b/arch/s390/kernel/time.c |
| @@ -226,7 +226,7 @@ void update_vsyscall(struct timekeeper * |
| vdso_data->wtom_clock_sec = |
| tk->xtime_sec + tk->wall_to_monotonic.tv_sec; |
| vdso_data->wtom_clock_nsec = tk->xtime_nsec + |
| - + (tk->wall_to_monotonic.tv_nsec << tk->shift); |
| + + ((u64) tk->wall_to_monotonic.tv_nsec << tk->shift); |
| nsecps = (u64) NSEC_PER_SEC << tk->shift; |
| while (vdso_data->wtom_clock_nsec >= nsecps) { |
| vdso_data->wtom_clock_nsec -= nsecps; |