From patchwork Thu Jun 20 14:11:58 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: 167342 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2124706ilk; Thu, 20 Jun 2019 07:12:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqwGcQ+5/SFc4rebTBdA5vRaj0BOXvnp95oB/iHN/2E9qQDasT+t0b9zYh8PHFbHKPtEuSb+ X-Received: by 2002:a65:64d6:: with SMTP id t22mr13358854pgv.406.1561039953627; Thu, 20 Jun 2019 07:12:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561039953; cv=none; d=google.com; s=arc-20160816; b=BE1AKEEayWnOdbghPpaEr2Mtk1Q/TDIIFyEcwk6TDc6ObZlwddEFc1ul6VwfncipYi yRC74/a9as113Efxu1BN171gxWkymrsXXhbp+sL10Hr2Dx+O7jofYRx9YPd5G0xpX87A 0MiYpdLxQeJL7NYuUqdyuLuS1nCuEEoR04FkR0C0IILBVI90PzZvVhYve1MztELPq/Ra wfe+5lCf7XaU+IRlQXXag6mGjVzLNd/tvOcoJbEw5yAyzcq3A0uqX7CRy81BqtprxCFy DpJPAYWhRiF27LVRJKTfJiJTR8U0Ma6HccGB2noVu+dIoDXjmXgWhLh/yTVsBKXmxi4c pM/Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YNli0qn/fXNhKtDOdCT3+KRB+1OZlplDHTQ2SaEZ0wA=; b=o20CYmAunuo1OxacVdpl92hKuM/dC9ZyCjB6PIDwqtSCPhJUTpSb9Xx88jWzozVe9w AIYTve8PrjTmp7/iq9RueAO0O1su6bffxToXQ6Jgf0ph6aT3ebsaUofU1/nbjTl3vRSh z8+H6R0N4KP8nDHu9Axv433CLlWqExAvd9YMtQ0YEB4KoALW8ac3QNz36MkTjUAGUyn3 uBrXsfg7ri5bNiUKWNu6vU/C0snoRya0DtkkiQblzPECcG+csqgMPnjCec+x6xpaL7fK BNR6oKZgCmyuEbqNhNU1xVKFGEf1hKMDCb4bTPPfRXwxBml+BQ+7MDNJgYHimw+VVXXF Wi1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=GB2hYv37; 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 h32si7818170pld.402.2019.06.20.07.12.33; Thu, 20 Jun 2019 07:12:33 -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=GB2hYv37; 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 S1732164AbfFTOMb (ORCPT + 30 others); Thu, 20 Jun 2019 10:12:31 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:46513 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726750AbfFTOMa (ORCPT ); Thu, 20 Jun 2019 10:12:30 -0400 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 6070bff6; Thu, 20 Jun 2019 13:39:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=59+R4/Fx/t8SyqprWAb/cnYmq hU=; b=GB2hYv37Ue9iey2fY1DbB5LsOHqqz0ANLpJt42JcEZSVrEwehdSKuLPJg FWrKqI4tPX7/Is8WAMF6inDpNj4JIphdUl9hynwbwcLk+rSLuDqO6qCayt/n0/kA HFt+tZgVK5qRCTLzzk8+f2fa0h/6/5QBCG77gjaQVynyuo3rlzB8SzJv431MDUUv DrsQhfNWcliCGJo6loT4O9PD+vwSvsoVQkBJhJ1OiJ/uYOfYNTaQgvTfDnoDZMII u+3jyEVz8awx400YNIMtg5Ov51sril7HNcrnYhMDwaN0/lulvdU5V9pLOhD7cfB3 +0+Xx0HQVrrONA5yS8Wt4EHhT0b8w== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id ec5a4d62 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 20 Jun 2019 13:39:11 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" , Arnd Bergmann , Thomas Gleixner Subject: [PATCH 2/3] timekeeping: use proper ktime_add when adding nsecs in coarse offset Date: Thu, 20 Jun 2019 16:11:58 +0200 Message-Id: <20190620141159.15965-2-Jason@zx2c4.com> In-Reply-To: <20190620141159.15965-1-Jason@zx2c4.com> References: <20190620141159.15965-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 --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0 Acked-by: Arnd Bergmann diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 4c97c9c8c217..db0081a14b90 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -817,7 +817,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);