Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f7164c authored by Tejun Heo's avatar Tejun Heo
Browse files

sched: Misc preps for cgroup unified hierarchy interface 



Make the following changes in preparation for the cpu controller
interface implementation for cgroup2.  This patch doesn't cause any
functional differences.

* s/cpu_stats_show()/cpu_cfs_stat_show()/

* s/cpu_files/cpu_legacy_files/

v2: Dropped cpuacct changes as it won't be used by cpu controller
    interface anymore.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
parent 8157a7fa

kernel/sched/core.c

+4 −4
Original line number Diff line number Diff line
@@ -6599,7 +6599,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) 
	return ret;

}



static int cpu_stats_show(struct seq_file *sf, void *v)

static int cpu_cfs_stat_show(struct seq_file *sf, void *v)

{

	struct task_group *tg = css_tg(seq_css(sf));

	struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
@@ -6639,7 +6639,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, 
}

#endif /* CONFIG_RT_GROUP_SCHED */



static struct cftype cpu_files[] = {

static struct cftype cpu_legacy_files[] = {

#ifdef CONFIG_FAIR_GROUP_SCHED

	{

		.name = "shares",
@@ -6660,7 +6660,7 @@ static struct cftype cpu_files[] = { 
	},

	{

		.name = "stat",

		.seq_show = cpu_stats_show,

		.seq_show = cpu_cfs_stat_show,

	},

#endif

#ifdef CONFIG_RT_GROUP_SCHED
@@ -6686,7 +6686,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { 
	.fork		= cpu_cgroup_fork,

	.can_attach	= cpu_cgroup_can_attach,

	.attach		= cpu_cgroup_attach,

	.legacy_cftypes	= cpu_files,

	.legacy_cftypes	= cpu_legacy_files,

	.early_init	= true,

};