From: "tip-bot2 for Thomas Weißschuh" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: thomas.weissschuh@linutronix.de,
Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] LoongArch: vdso: Remove timekeeper includes
Date: Tue, 15 Oct 2024 15:57:56 -0000 [thread overview]
Message-ID: <172900787624.1442.2259294902592829079.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20241010-vdso-generic-arch_update_vsyscall-v1-8-7fe5a3ea4382@linutronix.de>
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: fc06b914c1ce8009d6f469c512aa993b1c601da8
Gitweb: https://git.kernel.org/tip/fc06b914c1ce8009d6f469c512aa993b1c601da8
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 10 Oct 2024 17:44:51 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 15 Oct 2024 17:50:29 +02:00
LoongArch: vdso: Remove timekeeper includes
Since the generic VDSO clock mode storage is used, this header file is
unused and can be removed.
This avoids including a non-VDSO header while building the VDSO,
which can lead to compilation errors.
Also drop the comment which is out of date and in the wrong place.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241010-vdso-generic-arch_update_vsyscall-v1-8-7fe5a3ea4382@linutronix.de
---
arch/loongarch/include/asm/vdso/vsyscall.h | 4 ----
arch/loongarch/kernel/vdso.c | 1 -
2 files changed, 5 deletions(-)
diff --git a/arch/loongarch/include/asm/vdso/vsyscall.h b/arch/loongarch/include/asm/vdso/vsyscall.h
index b1273ce..8987e95 100644
--- a/arch/loongarch/include/asm/vdso/vsyscall.h
+++ b/arch/loongarch/include/asm/vdso/vsyscall.h
@@ -4,15 +4,11 @@
#ifndef __ASSEMBLY__
-#include <linux/timekeeper_internal.h>
#include <vdso/datapage.h>
extern struct vdso_data *vdso_data;
extern struct vdso_rng_data *vdso_rng_data;
-/*
- * Update the vDSO data page to keep in sync with kernel timekeeping.
- */
static __always_inline
struct vdso_data *__loongarch_get_k_vdso_data(void)
{
diff --git a/arch/loongarch/kernel/vdso.c b/arch/loongarch/kernel/vdso.c
index f6fcc52..4d7cb94 100644
--- a/arch/loongarch/kernel/vdso.c
+++ b/arch/loongarch/kernel/vdso.c
@@ -15,7 +15,6 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/time_namespace.h>
-#include <linux/timekeeper_internal.h>
#include <asm/page.h>
#include <asm/vdso.h>
next prev parent reply other threads:[~2024-10-15 15:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-10 15:44 [PATCH 0/9] vdso: Remove timekeeper argument and includes Thomas Weißschuh
2024-10-10 15:44 ` [PATCH 1/9] vdso: Remove timekeeper argument of __arch_update_vsyscall() Thomas Weißschuh
2024-10-14 13:59 ` Will Deacon
2024-10-15 15:58 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2024-10-10 15:44 ` [PATCH 2/9] arm: vdso: Remove timekeeper includes Thomas Weißschuh
2024-10-15 15:57 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2024-10-10 15:44 ` [PATCH 3/9] arm64: vdso: Remove timekeeper include Thomas Weißschuh
2024-10-14 13:59 ` Will Deacon
2024-10-15 15:57 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2024-10-10 15:44 ` [PATCH 4/9] powerpc/vdso: Remove timekeeper includes Thomas Weißschuh
2024-10-15 15:57 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2024-10-10 15:44 ` [PATCH 5/9] riscv: vdso: Remove timekeeper include Thomas Weißschuh
2024-10-15 15:57 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2024-10-10 15:44 ` [PATCH 6/9] s390/vdso: Remove timekeeper includes Thomas Weißschuh
2024-10-10 16:01 ` Heiko Carstens
2024-10-15 15:57 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2024-10-10 15:44 ` [PATCH 7/9] x86/vdso: Remove timekeeper include Thomas Weißschuh
2024-10-15 15:57 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2024-10-10 15:44 ` [PATCH 8/9] LoongArch: vdso: Remove timekeeper includes Thomas Weißschuh
2024-10-15 15:57 ` tip-bot2 for Thomas Weißschuh [this message]
2024-10-10 15:44 ` [PATCH 9/9] MIPS: " Thomas Weißschuh
2024-10-15 15:57 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
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=172900787624.1442.2259294902592829079.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=thomas.weissschuh@linutronix.de \
--cc=x86@kernel.org \
/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®