Commit 31f1bc03 authored by Yipeng Zou's avatar Yipeng Zou
Browse files

sched: smart_grid: silence complier error 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9PEF6


CVE: NA

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

Silence complier error with allnoconfig.

Implicit declaration of function without CONFIG_CGROUP_SCHED:
1. tg_update_affinity_domains
2. init_auto_affinity

Fixes: 6eb07f99 ("sched: Introduce smart grid scheduling strategy for cfs")
Signed-off-by: default avatarYipeng Zou <zouyipeng@huawei.com>
parent 7c6c7d83

kernel/sched/core.c

+7 −0
Original line number Diff line number Diff line
@@ -9733,7 +9733,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_update_numa(cpu, true);
@@ -9823,7 +9825,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;

}
@@ -9947,7 +9951,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
@@ -7253,7 +7253,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);