[tip: timers/ptp] kvmclock: Unexport kvmclock clocksource

From: tip-bot2 for Peter Hilber
Date: Sun Feb 11 2024 - 03:41:38 EST


The following commit has been merged into the timers/ptp branch of tip:

Commit-ID: 27f6a9c87a97f5ea7459be08d5be231af6b32c20
Gitweb: https://git.kernel.org/tip/27f6a9c87a97f5ea7459be08d5be231af6b32c20
Author: Peter Hilber <peter.hilber@xxxxxxxxxxxxxxx>
AuthorDate: Thu, 01 Feb 2024 02:04:53 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Wed, 07 Feb 2024 17:05:21 +01:00

kvmclock: Unexport kvmclock clocksource

The KVM PTP driver now refers to the clocksource ID CSID_X86_KVM_CLK, not
to the clocksource itself any more. There are no remaining users of the
clocksource export.

Therefore, make the clocksource static again.

Signed-off-by: Peter Hilber <peter.hilber@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240201010453.2212371-9-peter.hilber@xxxxxxxxxxxxxxx

---
arch/x86/include/asm/kvmclock.h | 2 --
arch/x86/kernel/kvmclock.c | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/kvmclock.h b/arch/x86/include/asm/kvmclock.h
index 511b350..f163176 100644
--- a/arch/x86/include/asm/kvmclock.h
+++ b/arch/x86/include/asm/kvmclock.h
@@ -4,8 +4,6 @@

#include <linux/percpu.h>

-extern struct clocksource kvm_clock;
-
DECLARE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);

static __always_inline struct pvclock_vcpu_time_info *this_cpu_pvti(void)
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 2f1bbf7..5b2c152 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -154,7 +154,7 @@ static int kvm_cs_enable(struct clocksource *cs)
return 0;
}

-struct clocksource kvm_clock = {
+static struct clocksource kvm_clock = {
.name = "kvm-clock",
.read = kvm_clock_get_cycles,
.rating = 400,
@@ -163,7 +163,6 @@ struct clocksource kvm_clock = {
.id = CSID_X86_KVM_CLK,
.enable = kvm_cs_enable,
};
-EXPORT_SYMBOL_GPL(kvm_clock);

static void kvm_register_clock(char *txt)
{