Commit a67b622c authored by Dongxu Sun's avatar Dongxu Sun
Browse files

kabi: fix kabi broken in struct clocksource and system_time_snapshot 

virt inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8DWT1



-------------------------------

fix kabi broken in struct clocksource and system_time_snapshot

Signed-off-by: default avatarDongxu Sun <sundongxu3@huawei.com>
parent 91c00a35

arch/arm64/kvm/hypercalls.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val) 
	 * architected counter, as this is the only one the guest

	 * can see.

	 */

	if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)

	if (systime_snapshot.cs_id != (short)CSID_ARM_ARCH_COUNTER)

		return;



	/*

include/linux/clocksource.h

+1 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ struct clocksource { 
	u32			shift;

	u64			max_idle_ns;

	u32			maxadj;

	KABI_FILL_HOLE(enum clocksource_ids	id)

#ifdef CONFIG_ARCH_CLOCKSOURCE_DATA

	struct arch_clocksource_data archdata;

#endif
@@ -105,7 +106,6 @@ struct clocksource { 
	const char		*name;

	struct list_head	list;

	int			rating;

	enum clocksource_ids	id;

	enum vdso_clock_mode	vdso_clock_mode;

	u16			vdso_fix;

	u16			vdso_shift;

include/linux/timekeeping.h

+3 −1
Original line number Diff line number Diff line
@@ -248,9 +248,11 @@ struct system_time_snapshot { 
	u64			cycles;

	ktime_t			real;

	ktime_t			raw;

	enum clocksource_ids	cs_id;

	unsigned int		clock_was_set_seq;

	u8			cs_was_changed_seq;

#ifndef __GENKSYMS__

	short			cs_id;

#endif

};



/**

kernel/time/timekeeping.c

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot) 
	do {

		seq = read_seqcount_begin(&tk_core.seq);

		now = tk_clock_read(&tk->tkr_mono);

		systime_snapshot->cs_id = tk->tkr_mono.clock->id;

		systime_snapshot->cs_id = (short)tk->tkr_mono.clock->id;

		systime_snapshot->cs_was_changed_seq = tk->cs_was_changed_seq;

		systime_snapshot->clock_was_set_seq = tk->clock_was_set_seq;

		base_real = ktime_add(tk->tkr_mono.base,