Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2802956pxa; Tue, 25 Aug 2020 03:52:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxo0c8XXD7b4PrurVYTFyHYtFQVlpXcrQM+ltBMusUuQrPFU99HXL1ZUWnjH8lnYJJA68PY X-Received: by 2002:a17:906:37c3:: with SMTP id o3mr10532512ejc.54.1598352761108; Tue, 25 Aug 2020 03:52:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598352761; cv=none; d=google.com; s=arc-20160816; b=yHHacZPQrZAMVUl+WmPlclvSAUSwX6MddFpLpKeB2HBDqF2nQIpA4/J4ZxWNv8crjv AWHR3u/gJWOU31Tqs4IHbdQOQ9eRxT2oBuZPRwoRBpoHzrEB9AyZMm9E2t9t9ingTxP/ XMOFqucyjOU8y8DQnkOfc9f4catZBRDkmAkb5vLvcg7D98nCtnsr2ZJfEeyDoyLTY7p6 SHTZMaBhYtLGP8o5ciWUTduhNy6132iKj9HGP7RgO8YByoJAAffVJFj+WW+L3c9zwWrO 7bM+2cv24/nPM/+oMk2obfyE+fymuqVhZECUTwaD0FQRnsPOoFGjYffrb6evTpOcj/SL Lzdg== 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 :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:dkim-signature :dkim-signature:date; bh=ED1azcYB2bOCp+uGW26ISv+HcMQc4w7N8XVMWmOZdus=; b=RD9Q3N0pewtZD7E+gObAhouNbl3mWjF4dQgrPV6vN6tgdxqI4t78mg9s1pWVlcr6TR 8A59/62GB99Q/rMDnsFDGPofOIBFt/Hdpt+1b8QXSACR9msomVcfCta677sttdjQdAmn NgTeIyrAox8xYUzoIG84sj2DYJH3BNvVCOzraGD7VmrCHMxAwJ4+DG95RZpHt40Zoa7w ND1hVgrfZWVsXiTYuY6xEEy/IP8ue55ZGg71A0G5BHONgxUmkY35DTziF/6GCox9HZ+n cxfGfkp37UJkAyHIW0aD4snq8qknYsV3GyvtU6apjw7l+FMt0Lbl8yyPE9y9APfzkhw1 q0tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=lTWHY8n7; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a19si6602075ejy.219.2020.08.25.03.52.17; Tue, 25 Aug 2020 03:52:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=lTWHY8n7; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729698AbgHYKu4 (ORCPT + 99 others); Tue, 25 Aug 2020 06:50:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729458AbgHYKux (ORCPT ); Tue, 25 Aug 2020 06:50:53 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B611C061574; Tue, 25 Aug 2020 03:50:53 -0700 (PDT) Date: Tue, 25 Aug 2020 10:50:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1598352650; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ED1azcYB2bOCp+uGW26ISv+HcMQc4w7N8XVMWmOZdus=; b=lTWHY8n74kWp+FHXndblMS7QFJrSQ3ooZ5wKtiFnaWvJmmQ3zxKBGXmczXoKFJU+6P3gat 82mfXNVkaGDMIjT8tcwC5TmL9f+21nFveTJn1bU3w60gQQ02Pvfh/8ce7chFTI4kyb0QLM 6vg3v230d+hOmCF6KCLMY9IH7o7rvbUx7IOdrsbLhaq2+CzS7ZY/n7STqUxnrFfxnqOxdF S7DjRgbDNk2DnpmlvH3JccFAqyAhEeIMzrIG7KOwhASJBh3tF50VeckqybZ8pCNpfWAlMX cPLPLiuBm2IBbqc0IXmf5fsjyDlwmboT7XGKRo62OwmhF2lh8F/iGAV3/tzbMg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1598352650; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ED1azcYB2bOCp+uGW26ISv+HcMQc4w7N8XVMWmOZdus=; b=w5qVkUqMb53mwlIrMZSsvru6WgYGK/44q87/q4rikG/UqaKhCT0j2OGr0kivvc0tWAkVtK lzCGLQ3bx25uVKBQ== From: "tip-bot2 for Xu Wang" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] alarmtimer: Convert comma to semicolon Cc: Xu Wang , Thomas Gleixner , Stephen Boyd , x86 , LKML In-Reply-To: <20200818062651.21680-1-vulab@iscas.ac.cn> References: <20200818062651.21680-1-vulab@iscas.ac.cn> MIME-Version: 1.0 Message-ID: <159835264988.389.5627891620040384998.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: ec02821c1d35f93b821bc9fdfa83a5f3e9d7275d Gitweb: https://git.kernel.org/tip/ec02821c1d35f93b821bc9fdfa83a5f3e9d7275d Author: Xu Wang AuthorDate: Tue, 18 Aug 2020 06:26:51 Committer: Thomas Gleixner CommitterDate: Tue, 25 Aug 2020 12:45:53 +02:00 alarmtimer: Convert comma to semicolon Replace a comma between expression statements by a semicolon. Signed-off-by: Xu Wang Signed-off-by: Thomas Gleixner Reviewed-by: Stephen Boyd Link: https://lore.kernel.org/r/20200818062651.21680-1-vulab@iscas.ac.cn --- kernel/time/alarmtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index ca223a8..f4ace1b 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -908,7 +908,7 @@ static int __init alarmtimer_init(void) /* Initialize alarm bases */ alarm_bases[ALARM_REALTIME].base_clockid = CLOCK_REALTIME; alarm_bases[ALARM_REALTIME].get_ktime = &ktime_get_real; - alarm_bases[ALARM_REALTIME].get_timespec = ktime_get_real_ts64, + alarm_bases[ALARM_REALTIME].get_timespec = ktime_get_real_ts64; alarm_bases[ALARM_BOOTTIME].base_clockid = CLOCK_BOOTTIME; alarm_bases[ALARM_BOOTTIME].get_ktime = &ktime_get_boottime; alarm_bases[ALARM_BOOTTIME].get_timespec = get_boottime_timespec;