From 029f64605acef7c73cfb46e4720171d0165a78af Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Mon, 28 Nov 2005 13:43:55 -0800
Subject: [PATCH] --- yaml --- r: 14719 b: refs/heads/master c:
 ee500f274914653a7d3dfca7d0140a3d21658e32 h: refs/heads/master i:   14717:
 3bfcf9f6c914701e1080b5b4128cf024831ddd50   14715:
 c15bffd8e64ea65586d40e6caa71898b93e48ec9   14711:
 d29b3c9665f941e1dfd7998a7799d123ce81b65e   14703:
 e2d2ab246d19304ed992b6c2607a0b367a9d39f2   14687:
 37eaedc31e948d2bbc916a0a22415193c54df612   14655:
 5bb6e3ef36060e63b9d1e333d926a8d203811639   14591:
 0d7116b479580e66df5e93bc3e91e19311f8819f v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/posix-cpu-timers.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index db3bd7dd7cd9..9cd72d1bd973 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46596338a10a54550ff03a6f60c28145a080296b
+refs/heads/master: ee500f274914653a7d3dfca7d0140a3d21658e32
diff --git a/trunk/kernel/posix-cpu-timers.c b/trunk/kernel/posix-cpu-timers.c
index 84af54c39e1b..cae4f5728997 100644
--- a/trunk/kernel/posix-cpu-timers.c
+++ b/trunk/kernel/posix-cpu-timers.c
@@ -36,7 +36,7 @@ timespec_to_sample(clockid_t which_clock, const struct timespec *tp)
 	union cpu_time_count ret;
 	ret.sched = 0;		/* high half always zero when .cpu used */
 	if (CPUCLOCK_WHICH(which_clock) == CPUCLOCK_SCHED) {
-		ret.sched = tp->tv_sec * NSEC_PER_SEC + tp->tv_nsec;
+		ret.sched = (unsigned long long)tp->tv_sec * NSEC_PER_SEC + tp->tv_nsec;
 	} else {
 		ret.cpu = timespec_to_cputime(tp);
 	}