Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1187968ybt; Thu, 18 Jun 2020 02:42:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGnsW7BO7HLuSXyYpA8Ys4AYGI0lH2R2GH8OLIOusJRm//g5xMKUA5s+UqOqq9IGpDCCIK X-Received: by 2002:a17:907:2162:: with SMTP id rl2mr2895597ejb.365.1592473364730; Thu, 18 Jun 2020 02:42:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592473364; cv=none; d=google.com; s=arc-20160816; b=SXnZCa8cF5vuzsCttI6EErZ9PYzUrPXoZh6ap6wFL9MZUM367f/nVRNwT/kl+C/N3Z u9i+J9yYP+YR363R27LMaJ/9R8zjyizSeLGWYdhElZVvPZQFfAQeJh1/5HyDcg6crQbp nwOGwdE/GgX3E8muR/KZKsyRr4U/2VLLX6YhsqdOrVKzns/MBEG/VZi0NPUCUAnceNzq tBNVZ0sX0Kaqb0NOZ4mdODayPlvGQAbckpHlh6kaQfZgDTKglgiJHTQ/oj9wC82RlF4J FMaypcnc9XHRx7P1lm1O5AIi0ghy03XlNxR6eXomNVYI8wx8Paof2YMIY8IivCFcdJ9Y wktw== 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:date; bh=g2uzjWNMQ+aE+8k/Hqq4XYxzg+LvRcN2ugwQrGW9MBM=; b=JD1I9K7cDRsm+/C8bVTkrIE9pN7BlqYlF7vRk/BtVI4fGaKW46jojRMelA0dPqJcNF MmUJB4O6IWffF5wVj6kH0NAp+Ma44EsEMRF0QEv4gmrIT00MYX2sYdpqH+t4cRT3gW6p nEvLWUAHKp7t/3qcUFG4KYyt6D3R+t+jk4ZLdkqdeP5QgkgqeKoW9quGr99LeVbt+CvK Af89XVfE99tUUTHGE/RndL+0pa1KNMP4hJSFmjMndf+iThVxzqp0ADAiqXWY7Kr/HCSj z+vTaSgimwfUnF8ScD8kouvwuQxKM1hy93IX4Vhr1Wp2BCxg/8vbjXD73/d6gW8M5nH/ NKIw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j6si1518367edp.147.2020.06.18.02.42.21; Thu, 18 Jun 2020 02:42:44 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729215AbgFRJkd (ORCPT + 99 others); Thu, 18 Jun 2020 05:40:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728568AbgFRJkc (ORCPT ); Thu, 18 Jun 2020 05:40:32 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ACC3C06174E; Thu, 18 Jun 2020 02:40:32 -0700 (PDT) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jlr26-00057f-LJ; Thu, 18 Jun 2020 11:40:30 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 7E30C1C0087; Thu, 18 Jun 2020 11:40:28 +0200 (CEST) Date: Thu, 18 Jun 2020 09:40:28 -0000 From: "tip-bot2 for Kurt Kanzenbach" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/urgent] timekeeping: Fix kerneldoc system_device_crosststamp & al Cc: Kurt Kanzenbach , Thomas Gleixner , x86 , LKML In-Reply-To: <20200609081726.5657-1-kurt@linutronix.de> References: <20200609081726.5657-1-kurt@linutronix.de> MIME-Version: 1.0 Message-ID: <159247322824.16989.7576904284562875293.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 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/urgent branch of tip: Commit-ID: f097eb38f71391ff2cf078788bad5a00eb3bd96a Gitweb: https://git.kernel.org/tip/f097eb38f71391ff2cf078788bad5a00eb3bd96a Author: Kurt Kanzenbach AuthorDate: Tue, 09 Jun 2020 10:17:26 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 18 Jun 2020 11:37:03 +02:00 timekeeping: Fix kerneldoc system_device_crosststamp & al Make kernel doc comments actually work and fix the syncronized typo. [ tglx: Added the missing /** and fixed up formatting ] Signed-off-by: Kurt Kanzenbach Signed-off-by: Thomas Gleixner Link: https://lkml.kernel.org/r/20200609081726.5657-1-kurt@linutronix.de --- include/linux/timekeeping.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index b27e2ff..d5471d6 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -222,9 +222,9 @@ extern bool timekeeping_rtc_skipresume(void); extern void timekeeping_inject_sleeptime64(const struct timespec64 *delta); -/* +/** * struct system_time_snapshot - simultaneous raw/real time capture with - * counter value + * counter value * @cycles: Clocksource counter value to produce the system times * @real: Realtime system time * @raw: Monotonic raw system time @@ -239,9 +239,9 @@ struct system_time_snapshot { u8 cs_was_changed_seq; }; -/* +/** * struct system_device_crosststamp - system/device cross-timestamp - * (syncronized capture) + * (synchronized capture) * @device: Device time * @sys_realtime: Realtime simultaneous with device time * @sys_monoraw: Monotonic raw simultaneous with device time @@ -252,12 +252,12 @@ struct system_device_crosststamp { ktime_t sys_monoraw; }; -/* +/** * struct system_counterval_t - system counter value with the pointer to the - * corresponding clocksource + * corresponding clocksource * @cycles: System counter value * @cs: Clocksource corresponding to system counter value. Used by - * timekeeping code to verify comparibility of two cycle values + * timekeeping code to verify comparibility of two cycle values */ struct system_counterval_t { u64 cycles;