From: "tip-bot2 for Zhan Xusheng" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Zhan Xusheng <zhanxusheng@xiaomi.com>,
Thomas Gleixner <tglx@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] vdso/datapage: Correct the vdso_timestamp kernel-doc
Date: Thu, 12 Nov 2026 19:16:35 -0000 [thread overview]
Message-ID: <179451099575.2969448.764019923398202575.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20261110062207.213676-1-zhanxusheng1024@gmail.com>
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: a877a3089b96ac0f7f8aa65a05ae5a441dbae1a5
Gitweb: https://git.kernel.org/tip/a877a3089b96ac0f7f8aa65a05ae5a441dbae1a5
Author: Zhan Xusheng <zhanxusheng@xiaomi.com>
AuthorDate: Tue, 10 Nov 2026 14:22:07 +08:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 12 Nov 2026 20:11:07 +01:00
vdso/datapage: Correct the vdso_timestamp kernel-doc
The kernel-doc of struct vdso_timestamp describes where its two fields come
from by naming the members that define them.
Both names changed. cycle_last and shift are members of struct vdso_clock,
and the array subscript in "vdso_time_data[x].shift" refers to a datapage
layout that no longer exists.
Rename the references accordingly.
Fixes: 886653e36639 ("vdso: Rework struct vdso_time_data and introduce struct vdso_clock")
Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20261110062207.213676-1-zhanxusheng1024@gmail.com
---
include/vdso/datapage.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h
index 5c4dac5..49d5081 100644
--- a/include/vdso/datapage.h
+++ b/include/vdso/datapage.h
@@ -48,11 +48,11 @@ struct vdso_arch_data {
*
* There is one vdso_timestamp object in vvar for each vDSO-accelerated
* clock_id. For high-resolution clocks, this encodes the time
- * corresponding to vdso_time_data.cycle_last. For coarse clocks this encodes
+ * corresponding to vdso_clock.cycle_last. For coarse clocks this encodes
* the actual time.
*
* To be noticed that for highres clocks nsec is left-shifted by
- * vdso_time_data[x].shift.
+ * vdso_clock.shift.
*/
struct vdso_timestamp {
u64 sec;
prev parent reply other threads:[~2026-11-12 19:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-10 6:22 [PATCH] " Zhan Xusheng
2026-11-12 19:16 ` tip-bot2 for Zhan Xusheng [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179451099575.2969448.764019923398202575.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@kernel.org \
--cc=x86@kernel.org \
--cc=zhanxusheng@xiaomi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®