From 2972a7a8244e007c2ace7de7b403538163e445d9 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 21 Aug 2012 20:30:47 -0400 Subject: [PATCH] --- yaml --- r: 322173 b: refs/heads/master c: 85dc8f05c93c8105987de9d7e7cebf15a72ff4ec h: refs/heads/master i: 322171: 08c36d4ef27809dfa96337cf2b2d5a62b1d1f618 v: v3 --- [refs] | 2 +- trunk/kernel/time/timekeeping.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad1c6b4c5667..7b54cff4a299 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 784ffcbb96c3a97b4c64fd48b1dfe12ef3fcbcda +refs/heads/master: 85dc8f05c93c8105987de9d7e7cebf15a72ff4ec diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index 258164ae45cc..1dbf80ec7696 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -277,7 +277,7 @@ static void timekeeping_forward_now(struct timekeeper *tk) tk->xtime_nsec += cycle_delta * tk->mult; /* If arch requires, add in gettimeoffset() */ - tk->xtime_nsec += arch_gettimeoffset() << tk->shift; + tk->xtime_nsec += (u64)arch_gettimeoffset() << tk->shift; tk_normalize_xtime(tk);