From: Chen Jiahao <chenjiahao16@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA -------- Reserving some fields in struct i2c_bus_recovery_info, i2c_adapter, i2c_board_info and i2c_algorithm for future development. conflict: include/linux/i2c.h Signed-off-by: Lin Yujun <linyujun809@huawei.com> --- include/linux/i2c.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 0dae9db27538..5a2f46e9f9c4 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -22,6 +22,7 @@ #include <linux/of.h> /* for struct device_node */ #include <linux/swab.h> /* for swab16 */ #include <uapi/linux/i2c.h> +#include <linux/kabi.h> extern struct bus_type i2c_bus_type; extern struct device_type i2c_adapter_type; @@ -433,6 +434,8 @@ struct i2c_board_info { const struct resource *resources; unsigned int num_resources; int irq; + + KABI_RESERVE(1) }; /** @@ -566,6 +569,9 @@ struct i2c_algorithm { int (*reg_slave)(struct i2c_client *client); int (*unreg_slave)(struct i2c_client *client); #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -655,6 +661,9 @@ struct i2c_bus_recovery_info { struct pinctrl *pinctrl; struct pinctrl_state *pins_default; struct pinctrl_state *pins_gpio; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; int i2c_recover_bus(struct i2c_adapter *adap); @@ -746,6 +755,8 @@ struct i2c_adapter { struct irq_domain *host_notify_domain; struct regulator *bus_regulator; + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) -- 2.34.1