Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp114825ybi; Thu, 20 Jun 2019 19:03:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqy2PFC6BJHyN1lsztukRl1cPMDs9dxFjvXmc43ae3v9AK9hK3qaDOfMGACZ3n1JSfQqTWtM X-Received: by 2002:a17:90a:8c06:: with SMTP id a6mr3138247pjo.45.1561082614437; Thu, 20 Jun 2019 19:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561082614; cv=none; d=google.com; s=arc-20160816; b=OO0qUMbpE/Y9vEN37MeQYtL4nddm8EAoPfllQJkKpVb/dYfMyz+JXL0d5qBiYla178 rnlNyJE7DdZ/HhOy0ObTZeRrRZ/eqLXmmYZbgKaYqDqWEZQC6wf2WabyCpKA/FPCbjk8 K24WCPXsxl4no7LyqbpRs1JmIpXQfLMI38j7mKVOZzRd+AiW6FKCAJrs5BseioCqH0f6 NvB62gWkS95eWNEsL4csoxNROIHTtC/yHJdZWhlXibe/TUbxxSWcHuO/SXuolMLRYII3 XtgA6UEtI2A//aG6oqXfP38MTutHwvMOrzfefNhbQa+39jM+5takYA7yFanaUUwS71IX zYJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:subject:from:message-id:cc:to; bh=FtOeYT6q8D1UmmWDyJL86SjCCunQT/VT/bD3h7o+yIs=; b=UBYCpIaEojxkV32aq0uTsXv76Q4xn48Fs/P3SM3CkjoDMPL9A7PDNhbYhRBfhS2BO+ IcvYORRWEnjx+w/3xnSLNEOEknjBv2Y9uyKpTzPvTH7NZailBbw6WnUrSw1+0F4nPgk1 Ua9/sscYoyta7xlVGH2QrpSAWjPnFC5KlNPtHu+mU/HFN120Enl5MS6DkQJJa7Xi/hZN WAEG4U0UrrXhJkGd4mrSrZvx74u/dm6/JVZWSmEm1lcjlobioSUJZ6mMZPzIlj8dtWtJ Mw0XR3I9C7IF4brXRGd6P9Q2uxi9PnZ749kDSzqA8eBA8aWJkTOZx4N9xM26Fx7hM1gW HZ9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a10si1145557pff.277.2019.06.20.19.03.18; Thu, 20 Jun 2019 19:03:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726310AbfFUCCu (ORCPT + 99 others); Thu, 20 Jun 2019 22:02:50 -0400 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:46878 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726259AbfFUCCu (ORCPT ); Thu, 20 Jun 2019 22:02:50 -0400 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id BC35129B2E; Thu, 20 Jun 2019 22:02:48 -0400 (EDT) To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org Message-Id: <3e1e24a326b8b623b1a8b66a905ac6494ef74a07.1561081886.git.fthain@telegraphics.com.au> From: Finn Thain Subject: [PATCH] rtc: Don't state that the RTC holds UTC in case it doesn't Date: Fri, 21 Jun 2019 11:51:26 +1000 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some machines store local time in the Real Time Clock. The hard-coded "UTC" string is wrong on those machines so just omit that string. Update the log parser so it doesn't require the string "UTC". Signed-off-by: Finn Thain --- drivers/rtc/hctosys.c | 2 +- tools/power/pm-graph/bootgraph.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c index ff2092a0d38c..2270eca23203 100644 --- a/drivers/rtc/hctosys.c +++ b/drivers/rtc/hctosys.c @@ -58,7 +58,7 @@ static int __init rtc_hctosys(void) err = do_settimeofday64(&tv64); - dev_info(rtc->dev.parent, "setting system clock to %ptR UTC (%lld)\n", + dev_info(rtc->dev.parent, "setting system clock to %ptR (%lld)\n", &tm, (long long)tv64.tv_sec); err_read: diff --git a/tools/power/pm-graph/bootgraph.py b/tools/power/pm-graph/bootgraph.py index 6dae57041537..5a045d1cb879 100755 --- a/tools/power/pm-graph/bootgraph.py +++ b/tools/power/pm-graph/bootgraph.py @@ -333,7 +333,7 @@ def parseKernelLog(): if(not sysvals.stamp['kernel']): sysvals.stamp['kernel'] = sysvals.kernelVersion(msg) continue - m = re.match('.* setting system clock to (?P.*) UTC.*', msg) + m = re.match('.* setting system clock to (?P.*) (?:UTC )?\(.*', msg) if(m): bt = datetime.strptime(m.group('t'), '%Y-%m-%d %H:%M:%S') bt = bt - timedelta(seconds=int(ktime)) -- 2.21.0