From patchwork Fri Jun 21 20:32:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 167417 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1192793ilk; Fri, 21 Jun 2019 13:35:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqzSYBB/ATOmAicDq1JJ0h2s/Hrt+BzE60xC17OBXmsInMm1+Jy9l3mfTSAPaUb+QWHA1FJn X-Received: by 2002:a63:fd50:: with SMTP id m16mr20148685pgj.192.1561149322934; Fri, 21 Jun 2019 13:35:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561149322; cv=none; d=google.com; s=arc-20160816; b=qH6h7ZwDdn8j3HkE9g1heTrTwSEUOtJtm/5MgDnTw4EfHEYZz3LVHrVTxqkmrt8F+d ljer4JewyTnHzevRRkcOhCK6gH32XQ2bmO/9kEp5MGCxSKoy+pyz+URBFnX1jyV5HhDK iUEZ4fkx2Q6Pa3f/0FfUVn8MgEBkPhvPaDvefGG3pjsBOgZTnwFDrc4g8Eumguot+yCg uJxrK3jDa57mafvQ9AkvqwaxmfXhdF3wTffGb1flnkP8LSMo6wmYvXMpnoKa4AY++s8U io7zyHOg6WNZKYBFxwiinyYi/eInyddVRoocC1+2W02AG7m3nu84zxm2XK2dmxWqfb9Q ycyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=4iO45WRdDnJ3MJ+ul3FxdMtjuMftzgvvMNDHXdqXk9Y=; b=BnYk25B47JUv6owKy1vRsmpr4A0nGPUn1xQL8HJ7svS7jJOM4wGWEPZ/7Z/f4rqavw R1jpOm9WqWONZSFR6g578nwlvgyN3tbTmxQrBWR73WGbt+Z/LOazvO9sj5kVnmVRVrdU nPCX0oIf9MP7yOFWEbqnYxBTwpWKzneD9uUpZN/qgHdfeIwR3sKPa3q80Nsp97eduLog dnYizn9vKsAJSdAI/vDX5sCIeXpLiuuTjDyOktBiGh4sDFsxKV+sJb9dxf3t2uV9fYfa JL307zMakFizvj30Fq5py/g8T3HBCQNd4u+wyvh/l4fNQPXft8mjHd/z0RwEa/G9nOHI FYWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=Qk4S+rNJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r11si3215464pgp.232.2019.06.21.13.35.22; Fri, 21 Jun 2019 13:35:22 -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; dkim=pass header.i=@zx2c4.com header.s=mail header.b=Qk4S+rNJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726138AbfFUUdI (ORCPT + 30 others); Fri, 21 Jun 2019 16:33:08 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:42643 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726031AbfFUUdH (ORCPT ); Fri, 21 Jun 2019 16:33:07 -0400 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id a658ee5d; Fri, 21 Jun 2019 19:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=mail; bh=HXEG48TtoQvEtc5LwJNKwDlPUwc=; b=Qk4S+rNJY5A6713JF8Hq q4+qdqDlRRN11jFoSlCtCOwBVxbK9X9fmM7tJQF7GrNwcg0eOkyGb05lxbyt4mb0 RmubUEL63SIA6y2pLcE8m+aj1ilIxTOWWbnHCGMwb5MsB/5aO1NkQJoZcl+5RBfa 27naxIiIw4UuEAisjYp2YnxSZ/2zk8g/E+ffhuRuO1zNC5qu6sK/CXUOAc1J7YVj pM9bgOdvtiUkS3rj9+sPg8ZhV9R+7sVtybHI5K1epKD4krcu7rMwwIY2v4Z+z6jb MzrziO7gnHMaYHOpL3ATlTVsGhlVQd5Y7tCrRV3WDwd3nfa6CSvcRh0e7+do69lW kQ== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 35acfb10 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 21 Jun 2019 19:59:39 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" , Arnd Bergmann , Thomas Gleixner Subject: [PATCH v5 1/3] timekeeping: use proper ktime_add when adding nsecs in coarse offset Date: Fri, 21 Jun 2019 22:32:47 +0200 Message-Id: <20190621203249.3909-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While this doesn't actually amount to a real difference, since the macro evaluates to the same thing, every place else operates on ktime_t using these functions, so let's not break the pattern. Fixes: e3ff9c3678b4 ("timekeeping: Repair ktime_get_coarse*() granularity") Signed-off-by: Jason A. Donenfeld Cc: Arnd Bergmann Cc: Thomas Gleixner Acked-by: Arnd Bergmann --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 44b726bab4bd..d911c8470149 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -819,7 +819,7 @@ ktime_t ktime_get_coarse_with_offset(enum tk_offsets offs) } while (read_seqcount_retry(&tk_core.seq, seq)); - return base + nsecs; + return ktime_add_ns(base, nsecs); } EXPORT_SYMBOL_GPL(ktime_get_coarse_with_offset);