hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8T231
--------------------------------
Reserve space for ipmi module in advance to prepare for merging new feature in the future.
Signed-off-by: Yi Yang yiyang13@huawei.com --- drivers/char/ipmi/ipmi_msghandler.c | 7 +++++++ include/linux/ipmi.h | 3 +++ include/linux/ipmi_smi.h | 5 +++++ 3 files changed, 15 insertions(+)
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 186f1fee7534..7b3d3634c173 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -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,8 @@ struct ipmi_user {
/* Free must run in process context for RCU cleanup. */ struct work_struct remove_work; + KABI_RESERVE(0); + KABI_RESERVE(1); };
static struct workqueue_struct *remove_work_wq; @@ -603,6 +606,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)
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index a1c9c0d48ebf..103b6056e31c 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h @@ -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,8 @@ 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); + KABI_RESERVE(1); };
#define INIT_IPMI_RECV_MSG(done_handler) \ diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h index 5d69820d8b02..e92d92e77569 100644 --- a/include/linux/ipmi_smi.h +++ b/include/linux/ipmi_smi.h @@ -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,8 @@ struct ipmi_smi_msg { * (presumably to free it). */ void (*done)(struct ipmi_smi_msg *msg); + KABI_RESERVE(0); + KABI_RESERVE(1); };
#define INIT_IPMI_SMI_MSG(done_handler) \ @@ -218,6 +221,8 @@ struct ipmi_smi_handlers { * block. */ void (*set_maintenance_mode)(void *send_info, bool enable); + KABI_RESERVE(0); + KABI_RESERVE(1); };
struct ipmi_device_id {