Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756828Ab2E3FLy (ORCPT ); Wed, 30 May 2012 01:11:54 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:61341 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756622Ab2E3FLw (ORCPT ); Wed, 30 May 2012 01:11:52 -0400 Date: Wed, 30 May 2012 07:11:38 +0200 From: Richard Cochran To: John Stultz Cc: linux-kernel@vger.kernel.org, Thomas Gleixner Subject: Re: [PATCH RFC V2 3/6] time: keep track of the pending utc/tai threshold Message-ID: <20120530051138.GA3356@netboy.at.omicron.at> References: <20120522173953.GA4177@netboy.at.omicron.at> <4FBBD591.1000103@linaro.org> <20120523082916.GA15627@localhost.localdomain> <4FBD1545.4070408@linaro.org> <20120523191747.GA2348@netboy.at.omicron.at> <4FBD4613.7040003@linaro.org> <20120524064340.GA2180@netboy.at.omicron.at> <20120524065726.GB2180@netboy.at.omicron.at> <4FC57BF9.5010608@linaro.org> <4FC57CAA.3030809@us.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4FC57CAA.3030809@us.ibm.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 907 Lines: 24 On Tue, May 29, 2012 at 06:49:30PM -0700, John Stultz wrote: > diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c > index 6e46cac..81c76a9 100644 > --- a/kernel/time/timekeeping.c > +++ b/kernel/time/timekeeping.c > @@ -962,6 +962,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift) > timekeeper.xtime.tv_sec++; > leap = second_overflow(timekeeper.xtime.tv_sec); > timekeeper.xtime.tv_sec += leap; > + timekeeper.wall_to_monotonic.tv_sec -= leap; Don't you need this in update_wall_time() too? BTW I suggest refactoring this code (two almost identical if{} bodies) into a shared helper function. Thanks, Richard -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/