Unverified Commit 3b3aa19e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7689 [sync] PR-7370: v2 sched: smart_grid: silence complier error 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7370 
 
PR sync from: Yipeng Zou <zouyipeng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2XIC26OP677LDJMI6ZXNPMK5VIF2TEF3/ 
 
https://gitee.com/openeuler/kernel/issues/I9PEF6 
 
Link:https://gitee.com/openeuler/kernel/pulls/7689

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 0d9d0b0a 6f4a96f6

kernel/sched/core.c

+7 −0
Original line number Diff line number Diff line
@@ -8052,7 +8052,9 @@ int sched_cpu_activate(unsigned int cpu) 
		static_branch_inc_cpuslocked(&sched_smt_present);

#endif

	set_cpu_active(cpu, true);

#ifdef CONFIG_QOS_SCHED_SMART_GRID

	tg_update_affinity_domains(cpu, 1);

#endif



	if (sched_smp_initialized) {

		sched_domains_numa_masks_set(cpu);
@@ -8115,7 +8117,9 @@ int sched_cpu_deactivate(unsigned int cpu) 
		return ret;

	}

	sched_domains_numa_masks_clear(cpu);

#ifdef CONFIG_QOS_SCHED_SMART_GRID

	tg_update_affinity_domains(cpu, 0);

#endif

	return 0;

}
@@ -8187,7 +8191,10 @@ void __init sched_init_smp(void) 
	sched_smp_initialized = true;



	sched_grid_zone_init();



#ifdef CONFIG_QOS_SCHED_SMART_GRID

	init_auto_affinity(&root_task_group);

#endif

}



static int __init migration_init(void)

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -6243,7 +6243,7 @@ static void destroy_auto_affinity(struct task_group *tg) 
	tg->auto_affinity = NULL;

}

#else

static void destroy_auto_affinity(struct task_group *tg) {}

static void __maybe_unused destroy_auto_affinity(struct task_group *tg) {}



#ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY

static inline bool prefer_cpus_valid(struct task_struct *p);