[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CANcMJZAzT-fCXY2P0ZRjdMoXq+dNd3rrq3eNY18pgob-hS6L9g@mail.gmail.com>
Date: Fri, 8 Feb 2013 13:46:29 -0800
From: John Stultz <john.stultz@...aro.org>
To: Prarit Bhargava <prarit@...hat.com>
Cc: linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [PATCH] time, Fix setting of hardware clock in NTP code
On Fri, Feb 8, 2013 at 4:55 AM, Prarit Bhargava <prarit@...hat.com> wrote:
> diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
> index 24174b4..e98f6b7 100644
> --- a/kernel/time/ntp.c
> +++ b/kernel/time/ntp.c
> @@ -510,8 +510,12 @@ static void sync_cmos_clock(struct work_struct *work)
> }
>
> getnstimeofday(&now);
> - if (abs(now.tv_nsec - (NSEC_PER_SEC / 2)) <= tick_nsec / 2)
> - fail = update_persistent_clock(now);
> + if (abs(now.tv_nsec - (NSEC_PER_SEC / 2)) <= tick_nsec / 2) {
> + struct timespec adjust = now;
> + if (persistent_clock_is_local)
> + adjust.tv_sec -= (sys_tz.tz_minuteswest * 60);
> + fail = update_persistent_clock(adjust);
> + }
>
Do you mind reworking this patch on top of tip/timers/core? There's
some recent changes that interact here.
thanks
-john
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists