Merge "sched/tune: remove disabling sched_boost per cgroup" (6cfce279) · Commits · e / devices / android_kernel_xiaomi_nabu

kernel/sched/tune.c

+1 −34

Original line number	Diff line number	Diff line
		@@ -100,12 +100,6 @@ struct schedtune {
		*/
		bool sched_boost_enabled;

		/*
		* This tracks the default value of sched_boost_enabled and is used
		* restore the value following any temporary changes to that flag.
		*/
		bool sched_boost_enabled_backup;

		/*
		* Controls whether tasks of this cgroup should be colocated with each
		* other and tasks of other cgroups that have the same flag turned on.
		@@ -151,7 +145,6 @@ root_schedtune = {
		#ifdef CONFIG_SCHED_WALT
		.sched_boost_no_override = false,
		.sched_boost_enabled = true,
		.sched_boost_enabled_backup = true,
		.colocate = false,
		.colocate_update_disabled = false,
		#endif
		@@ -211,7 +204,6 @@ static inline void init_sched_boost(struct schedtune *st)
		{
		st->sched_boost_no_override = false;
		st->sched_boost_enabled = true;
		st->sched_boost_enabled_backup = st->sched_boost_enabled;
		st->colocate = false;
		st->colocate_update_disabled = false;
		}
		@@ -244,8 +236,7 @@ void restore_cgroup_boost_settings(void)
		if (!allocated_group[i])
		break;

		allocated_group[i]->sched_boost_enabled =
		allocated_group[i]->sched_boost_enabled_backup;
		allocated_group[i]->sched_boost_enabled = true;
		}
		}

		@@ -528,25 +519,6 @@ int schedtune_can_attach(struct cgroup_taskset *tset)
		}

		#ifdef CONFIG_SCHED_WALT
		static u64 sched_boost_enabled_read(struct cgroup_subsys_state *css,
		struct cftype *cft)
		{
		struct schedtune *st = css_st(css);

		return st->sched_boost_enabled;
		}

		static int sched_boost_enabled_write(struct cgroup_subsys_state *css,
		struct cftype *cft, u64 enable)
		{
		struct schedtune *st = css_st(css);

		st->sched_boost_enabled = !!enable;
		st->sched_boost_enabled_backup = st->sched_boost_enabled;

		return 0;
		}

		static u64 sched_colocate_read(struct cgroup_subsys_state *css,
		struct cftype *cft)
		{
		@@ -733,11 +705,6 @@ static struct cftype files[] = {
		.read_u64 = sched_boost_override_read,
		.write_u64 = sched_boost_override_write,
		},
		{
		.name = "sched_boost_enabled",
		.read_u64 = sched_boost_enabled_read,
		.write_u64 = sched_boost_enabled_write,
		},
		{
		.name = "colocate",
		.read_u64 = sched_colocate_read,