From patchwork Fri Jun 21 15:05:19 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: 167394 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp858703ilk; Fri, 21 Jun 2019 08:05:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqxAJbX2OIhVXx4FExWRc4zyhpDaDjsWgNMKTiJev3UYqiFd47UHhf9PQGoFTjNe2aQu1yT+ X-Received: by 2002:a65:6089:: with SMTP id t9mr18580128pgu.170.1561129547909; Fri, 21 Jun 2019 08:05:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561129547; cv=none; d=google.com; s=arc-20160816; b=HiSVzTTZlfw0AUK8KM6/mWG3bXIdWBfv89QM66Md4jVT8SVcqdj+p1trrR3D7ypBtO OxdjBH983FrmxILDbTkWPUgV7a3J22OeCneJ4cOOHioowFdr/Cg9dHigw9wt2vfnbWMr twTILlmbtHU07nrN+VuOCUhmilOD3pPYzenGj8KC5j3S9P+m9KJf9+sr3Qvazrga4s5S xjtVkVfcjmq1/A2g/lcz4Ar3QzSA2gkkrMMyy3tk0howj1c/D0HmkNGPSPDk6mw4DY0M O5RWa+qbt+EVQJGWW9Ouc+93BaeXLFxu+pZnTkXyhYRZK/vKnqJc9l7kHRZXdPhzWzb1 ct3Q== 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=qu+wBuge9Y16gpnbLxar+BTxAA4mEcW4vlJqeeHQu50=; b=jzJp3yG9DAn0w18+ootQlbCe+zHLdN8VTYynIy2W0hGQtTc+6eOxjvSwnOECim+8JR qMr+/sg50escjR03E7B5UJk38izYRJfwyX4FIQigobmxoukrDIfyl2Nt/dzDG60yzdxF vvjxJZAxiX6iIhE3VHKv8z7+Q5voqrhzAmlnCvlYYCzFb4Q5QubIvNJIkZcMHDTqOTqp ZGEjIj8DSw1aCJmAIAixjChHAHz+ztxZJm79249DCK0MHXOli/dPNpBJsfoGNH/3ZORd tmrqvWpL0knKgwyVzx00sFgwZdTZHqGPruPujmW565RgfMcRcwunbkFiWHMwsXnFxzt7 bAsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=nZ6xt4gB; 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 e13si2847256pfn.24.2019.06.21.08.05.47; Fri, 21 Jun 2019 08:05:47 -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=nZ6xt4gB; 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 S1726405AbfFUPFq (ORCPT + 30 others); Fri, 21 Jun 2019 11:05:46 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:40599 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726002AbfFUPFp (ORCPT ); Fri, 21 Jun 2019 11:05:45 -0400 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id c2a1c366; Fri, 21 Jun 2019 14:32:19 +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=BCgOtPxwBhFl9ERxKMkR8S0mK lU=; b=nZ6xt4gB2O/bPt4oGCvRZJWbqW63sjiaDsP3WvxX/ZfCdRRYvFjllZONb KIBUN3CuXIlEDEorEGJ9MeWYmVbb/lfydMhfXAXA5XsCXVdJXCiX34z9i88IuUll 2fBpGon9WP4jD+nWVP3nM5tm8TNVSui/Fuzl1c/DDLMQgtoWqa7q90p7vRySXNgI vJDgFC+xlI5dEDfZR32RIWnHM8hm4p8yFItyrmh+6nMYUGR7u7deoNqhFXbfecaD f9bCv+d1SNMSkIKmTAMOI5Yd8QxBfsCQjXIbp9aFVBU89euoNuGrmqShkf9ifK1H QR+3OXvUa9LHrDLEYuucVhqtMtYhQ== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 591e8a04 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 21 Jun 2019 14:32:18 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" , Arnd Bergmann , Thomas Gleixner Subject: [PATCH v3 2/4] timekeeping: use proper ktime_add when adding nsecs in coarse offset Date: Fri, 21 Jun 2019 17:05:19 +0200 Message-Id: <20190621150521.17687-2-Jason@zx2c4.com> In-Reply-To: <20190621150521.17687-1-Jason@zx2c4.com> References: <20190621150521.17687-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 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);