hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8ZTTF CVE: NA

--------------------------------

There is no need use __GENKSYMS__.

Fixes: 00d37128abe2 ("sched: Introduce smart grid scheduling strategy for cfs") Signed-off-by: Yipeng Zou zouyipeng@huawei.com --- include/linux/sched.h | 5 +---- kernel/sched/sched.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h index 8ccbca99ace1..4688bd8a44aa 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1450,15 +1450,12 @@ struct task_struct { KABI_RESERVE(11) #endif

-#if !defined(__GENKSYMS__) #if defined(CONFIG_QOS_SCHED_SMART_GRID) struct sched_grid_qos *grid_qos; #else KABI_RESERVE(12) #endif -#else - KABI_RESERVE(12) -#endif + #ifdef CONFIG_PSI_FINE_GRAINED KABI_USE(13, int memstall_type) #else diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 18c1b3d5a378..1044664bccfa 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -500,7 +500,7 @@ struct task_group { #else KABI_RESERVE(3) #endif -#if defined(CONFIG_QOS_SCHED_SMART_GRID) && !defined(__GENKSYMS__) +#if defined(CONFIG_QOS_SCHED_SMART_GRID) KABI_USE(4, struct auto_affinity *auto_affinity) #else KABI_RESERVE(4)