hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8T231
--------------------------------
Reserve space for mtd module in advance to prepare for merging new feature in the future.
Signed-off-by: Yi Yang yiyang13@huawei.com --- include/linux/mtd/mtd.h | 8 ++++++++ include/linux/mtd/partitions.h | 2 ++ 2 files changed, 10 insertions(+)
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 914a9f974baa..142cffb6a806 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -13,6 +13,7 @@ #include <linux/device.h> #include <linux/of.h> #include <linux/nvmem-provider.h> +#include <linux/kabi.h>
#include <mtd/mtd-abi.h>
@@ -77,6 +78,7 @@ struct mtd_oob_ops { uint8_t *datbuf; uint8_t *oobbuf; struct mtd_req_stats *stats; + KABI_RESERVE(0); };
/** @@ -215,6 +217,7 @@ struct mtd_part { u64 offset; u64 size; u32 flags; + KABI_RESERVE(0); };
/** @@ -233,6 +236,7 @@ struct mtd_master { struct mutex partitions_lock; struct mutex chrdev_lock; unsigned int suspended : 1; + KABI_RESERVE(0); };
struct mtd_info { @@ -398,6 +402,10 @@ struct mtd_info {
struct mtd_part part; struct mtd_master master; + KABI_RESERVE(0); + KABI_RESERVE(1); + KABI_RESERVE(2); + KABI_RESERVE(3); };
static inline struct mtd_info *mtd_get_master(struct mtd_info *mtd) diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h index b74a539ec581..aed435110429 100644 --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h @@ -10,6 +10,7 @@ #define MTD_PARTITIONS_H
#include <linux/types.h> +#include <linux/kabi.h>
/* @@ -51,6 +52,7 @@ struct mtd_partition { uint32_t mask_flags; /* master MTD flags to mask out for this partition */ uint32_t add_flags; /* flags to add to the partition */ struct device_node *of_node; + KABI_RESERVE(0); };
#define MTDPART_OFS_RETAIN (-3)