NoaSoftware
/
TencentOS-kernel
forked from TencentOS/TencentOS-kernel
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kabi: fix kabi reserve place bug 

change place of some reserve words because they are placed under dynamic array

Signed-off-by: Denise Cheng <denisecheng@tencent.com>
This commit is contained in:
Denise Cheng 2021-08-04 19:08:45 +08:00 committed by kaixuxiakx
parent e6e20d423d
commit ed00a88eb6
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/bio.h
View File

@ -320,10 +320,11 @@ struct bio_integrity_payload {
struct work_struct bip_work; /* I/O completion */
struct bio_vec *bip_vec;
struct bio_vec bip_inline_vecs[0];/* embedded bvec array */
KABI_RESERVE(1);
KABI_RESERVE(2);
struct bio_vec bip_inline_vecs[0];/* embedded bvec array */
};
#if defined(CONFIG_BLK_DEV_INTEGRITY)
@ -722,12 +723,13 @@ struct bio_set {
spinlock_t rescue_lock;
struct bio_list rescue_list;
struct work_struct rescue_work;
struct workqueue_struct *rescue_workqueue;
KABI_RESERVE(1);
KABI_RESERVE(2);
KABI_RESERVE(3);
KABI_RESERVE(4);
struct workqueue_struct *rescue_workqueue;
};
struct biovec_slab {

3
include/linux/genhd.h
View File

@ -132,12 +132,13 @@ struct hd_struct {
struct disk_stats dkstats;
#endif
struct percpu_ref ref;
struct rcu_work rcu_work;
KABI_RESERVE(1);
KABI_RESERVE(2);
KABI_RESERVE(3);
KABI_RESERVE(4);
struct rcu_work rcu_work;
};
#define GENHD_FL_REMOVABLE 1

3
include/linux/mm_types.h
View File

@ -353,12 +353,13 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
#endif
struct vm_userfaultfd_ctx vm_userfaultfd_ctx;
KABI_RESERVE(1);
KABI_RESERVE(2);
KABI_RESERVE(3);
KABI_RESERVE(4);
struct vm_userfaultfd_ctx vm_userfaultfd_ctx;
} __randomize_layout;
struct core_thread {

10
include/linux/module.h
View File

@ -448,6 +448,11 @@ struct module {
keeping pointers to this stuff */
char *args;
KABI_RESERVE(1);
KABI_RESERVE(2);
KABI_RESERVE(3);
KABI_RESERVE(4);
#ifdef CONFIG_SMP
/* Per-cpu data. */
void __percpu *percpu;
@ -520,11 +525,6 @@ struct module {
struct error_injection_entry *ei_funcs;
unsigned int num_ei_funcs;
#endif
KABI_RESERVE(1);
KABI_RESERVE(2);
KABI_RESERVE(3);
KABI_RESERVE(4);
} ____cacheline_aligned __randomize_layout;
#ifndef MODULE_ARCH_INIT
#define MODULE_ARCH_INIT {}