From 8a53999a7b1d0fe5a0e1777d0ab217336d95cb2b Mon Sep 17 00:00:00 2001 From: Cheng Jian Date: Wed, 14 Apr 2021 14:28:43 +0800 Subject: [PATCH] sched/fair: fix kabi broken due to adding fields in rq and sched_domain_shared hulk inclusion category: bugfix bugzilla: 38261, https://bugzilla.openeuler.org/show_bug.cgi?id=23 CVE: NA --------------------------- Previous patches added fields in struct rq and sched_domain_shared, which caused the KABI changed. We can use some helper structures to fix this KABI change, but this is not necessary, because these structures are only used internally, the driver is not aware of them, so we simply avoid them. Signed-off-by: Cheng Jian Reviewed-by: Xie XiuQi --- include/linux/sched/topology.h | 2 +- kernel/sched/sched.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 936dfbf0e87f..a9032116c13e 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -72,7 +72,7 @@ struct sched_domain_shared { atomic_t ref; atomic_t nr_busy_cpus; int has_idle_cores; -#ifdef CONFIG_SCHED_STEAL +#if defined(CONFIG_SCHED_STEAL) && !defined(__GENKSYMS__) struct sparsemask *cfs_overload_cpus; #endif }; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index a23302037220..ca2fd2d6171f 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -832,7 +832,7 @@ struct rq { struct cfs_rq cfs; struct rt_rq rt; struct dl_rq dl; -#ifdef CONFIG_SCHED_STEAL +#if defined(CONFIG_SCHED_STEAL) && !defined(__GENKSYMS__) struct sparsemask *cfs_overload_cpus; #endif @@ -939,7 +939,7 @@ struct rq { unsigned int ttwu_count; unsigned int ttwu_local; -#ifdef CONFIG_SCHED_STEAL +#if defined(CONFIG_SCHED_STEAL) && !defined(__GENKSYMS__) /* Idle search stats */ unsigned int found_idle_core; unsigned int found_idle_cpu; -- GitLab