Unverified Commit 5fb5d63e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4495 KABI reservation for driver 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZKG5WG7RUMM5X3X6OUN7CWCT52SQEFTH/ 
KABI reservation for tty/mtd/mmc/ipmi

Yi Yang (5):
  tty: kabi: KABI reservation for tty
  mtd: kabi: KABI reservation for mtd
  mmc: kabi: KABI reservation for mmc
  ipmi: kabi: KABI reservation for ipmi
  audit: kabi: Remove extra semicolons


-- 
2.25.1
 
https://gitee.com/openeuler/kernel/issues/I8T231
https://gitee.com/openeuler/kernel/issues/I8WCAR 
 
Link:https://gitee.com/openeuler/kernel/pulls/4495

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 16484e4c 55ada351

drivers/char/ipmi/ipmi_msghandler.c

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

#include <linux/vmalloc.h>

#include <linux/delay.h>

#include <linux/kabi.h>



#define IPMI_DRIVER_VERSION "39.2"
@@ -203,6 +204,7 @@ struct ipmi_user { 


	/* Free must run in process context for RCU cleanup. */

	struct work_struct remove_work;

	KABI_RESERVE(0)

};



static struct workqueue_struct *remove_work_wq;
@@ -603,6 +605,10 @@ struct ipmi_smi { 
	 * parameters passed by "low" level IPMI code.

	 */

	int run_to_completion;

	KABI_RESERVE(0)

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

};

#define to_si_intf_from_dev(device) container_of(device, struct ipmi_smi, dev)

include/linux/ipmi.h

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

#include <linux/proc_fs.h>

#include <linux/acpi.h> /* For acpi_handle */

#include <linux/kabi.h>



struct module;

struct device;
@@ -70,6 +71,7 @@ struct ipmi_recv_msg { 
	 * the size or existence of this, since it may change.

	 */

	unsigned char   msg_data[IPMI_MAX_MSG_LENGTH];

	KABI_RESERVE(0)

};



#define INIT_IPMI_RECV_MSG(done_handler) \

include/linux/ipmi_smi.h

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

#include <linux/platform_device.h>

#include <linux/ipmi.h>

#include <linux/kabi.h>



struct device;
@@ -123,6 +124,7 @@ struct ipmi_smi_msg { 
	 * (presumably to free it).

	 */

	void (*done)(struct ipmi_smi_msg *msg);

	KABI_RESERVE(0)

};



#define INIT_IPMI_SMI_MSG(done_handler) \
@@ -218,6 +220,7 @@ struct ipmi_smi_handlers { 
	 * block.

	 */

	void (*set_maintenance_mode)(void *send_info, bool enable);

	KABI_RESERVE(0)

};



struct ipmi_device_id {

include/linux/mmc/card.h

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/device.h>

#include <linux/mod_devicetable.h>

#include <linux/kabi.h>



struct mmc_cid {

	unsigned int		manfid;
@@ -126,6 +127,8 @@ struct mmc_ext_csd { 
	u8			device_life_time_est_typ_b;	/* 269 */



	unsigned int            feature_support;

	KABI_RESERVE(0)

	KABI_RESERVE(1)

#define MMC_DISCARD_FEATURE	BIT(0)                  /* CMD38 feature */

};
@@ -341,6 +344,9 @@ struct mmc_card { 
	unsigned int    nr_parts;



	struct workqueue_struct *complete_wq;	/* Private workqueue */

	KABI_RESERVE(0)

	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



static inline bool mmc_large_sector(struct mmc_card *card)

include/linux/mmc/host.h

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/mmc/pm.h>

#include <linux/dma-direction.h>

#include <linux/blk-crypto-profile.h>

#include <linux/kabi.h>



struct mmc_ios {

	unsigned int	clock;			/* clock rate */
@@ -78,6 +79,8 @@ struct mmc_ios { 
#define MMC_SET_DRIVER_TYPE_D	3



	bool enhanced_strobe;			/* hs400es selection */

	KABI_RESERVE(0)

	KABI_RESERVE(1)

};



struct mmc_clk_phase {
@@ -218,6 +221,8 @@ struct mmc_host_ops { 


	/* Initialize an SD express card, mandatory for MMC_CAP2_SD_EXP. */

	int	(*init_sd_express)(struct mmc_host *host, struct mmc_ios *ios);

	KABI_RESERVE(0)

	KABI_RESERVE(1)

};



struct mmc_cqe_ops {
@@ -528,6 +533,9 @@ struct mmc_host { 
	bool			hsq_enabled;



	u32			err_stats[MMC_ERR_MAX];

	KABI_RESERVE(0)

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	unsigned long		private[] ____cacheline_aligned;

};