Unverified Commit 5490724d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4584 v5 kabi reserve 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yu Liao <liaoyu15@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MKLQHLWHHAWPNE4OWUVYS7SJ5HSCYDIH/ 
Yu Liao (6):
  kabi: reserve space for kobject related structures
  kabi: reserve space for hrtimer related structures
  kabi: reserve space for posix clock related structure
  kabi: reserve space for struct ptp_clock_info
  kabi: reserve space for struct timer_list
  kabi: reserve space for struct clocksource


-- 
2.33.0
 
https://gitee.com/openeuler/kernel/issues/I907ZP
https://gitee.com/openeuler/kernel/issues/I908BZ
https://gitee.com/openeuler/kernel/issues/I9083Y
https://gitee.com/openeuler/kernel/issues/I9087L
https://gitee.com/openeuler/kernel/issues/I907UN
https://gitee.com/openeuler/kernel/issues/I908BC 
 
Link:https://gitee.com/openeuler/kernel/pulls/4584

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 89d9f22d 654c3b93

include/linux/clocksource.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/clocksource_ids.h>

#include <asm/div64.h>

#include <asm/io.h>

#include <linux/kabi.h>



struct clocksource;

struct module;
@@ -131,6 +132,11 @@ struct clocksource { 
	u64			wd_last;

#endif

	struct module		*owner;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



/*

include/linux/hrtimer.h

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/seqlock.h>

#include <linux/timer.h>

#include <linux/timerqueue.h>

#include <linux/kabi.h>



struct hrtimer_clock_base;

struct hrtimer_cpu_base;
@@ -124,6 +125,9 @@ struct hrtimer { 
	u8				is_rel;

	u8				is_soft;

	u8				is_hard;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/**
@@ -165,6 +169,9 @@ struct hrtimer_clock_base { 
	struct timerqueue_head	active;

	ktime_t			(*get_time)(void);

	ktime_t			offset;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

} __hrtimer_clock_base_align;



enum  hrtimer_base_type {
@@ -235,6 +242,9 @@ struct hrtimer_cpu_base { 
	ktime_t				softirq_expires_next;

	struct hrtimer			*softirq_next_timer;

	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];



	KABI_RESERVE(1)

	KABI_RESERVE(2)

} ____cacheline_aligned;



static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)

include/linux/kobject.h

+10 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#ifndef _KOBJECT_H_

#define _KOBJECT_H_



#include <linux/kabi.h>

#include <linux/types.h>

#include <linux/list.h>

#include <linux/sysfs.h>
@@ -79,6 +80,9 @@ struct kobject { 
#ifdef CONFIG_DEBUG_KOBJECT_RELEASE

	struct delayed_work	release;

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



__printf(2, 3) int kobject_set_name(struct kobject *kobj, const char *name, ...);
@@ -120,6 +124,9 @@ struct kobj_type { 
	const struct kobj_ns_type_operations *(*child_ns_type)(const struct kobject *kobj);

	const void *(*namespace)(const struct kobject *kobj);

	void (*get_ownership)(const struct kobject *kobj, kuid_t *uid, kgid_t *gid);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



struct kobj_uevent_env {
@@ -170,6 +177,9 @@ struct kset { 
	spinlock_t list_lock;

	struct kobject kobj;

	const struct kset_uevent_ops *uevent_ops;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

} __randomize_layout;



void kset_init(struct kset *kset);

include/linux/posix-clock.h

+11 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/poll.h>

#include <linux/posix-timers.h>

#include <linux/rwsem.h>

#include <linux/kabi.h>



struct posix_clock;
@@ -62,6 +63,11 @@ struct posix_clock_operations { 


	ssize_t (*read)    (struct posix_clock *pc,

			    uint flags, char __user *buf, size_t cnt);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



/**
@@ -88,6 +94,11 @@ struct posix_clock { 
	struct device *dev;

	struct rw_semaphore rwsem;

	bool zombie;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



/**

include/linux/ptp_clock_kernel.h

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/ptp_clock.h>

#include <linux/timecounter.h>

#include <linux/skbuff.h>

#include <linux/kabi.h>



#define PTP_CLOCK_NAME_LEN	32

/**
@@ -193,6 +194,11 @@ struct ptp_clock_info { 
	int (*verify)(struct ptp_clock_info *ptp, unsigned int pin,

		      enum ptp_pin_function func, unsigned int chan);

	long (*do_aux_work)(struct ptp_clock_info *ptp);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct ptp_clock;