diff options
Diffstat (limited to 'android-mainline/Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch')
| -rw-r--r-- | android-mainline/Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/android-mainline/Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch b/android-mainline/Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch index 41d2a47d..2856ea31 100644 --- a/android-mainline/Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch +++ b/android-mainline/Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch @@ -615,7 +615,7 @@ diff --git a/kernel/sched/core.c b/kernel/sched/core.c dump_stack(); add_taint(TAINT_WARN, LOCKDEP_STILL_OK); } -@@ -10539,6 +10660,7 @@ static int cpu_cgroup_css_online(struct cgroup_subsys_state *css) +@@ -10516,6 +10637,7 @@ static int cpu_cgroup_css_online(struct cgroup_subsys_state *css) cpu_util_update_eff(css); #endif @@ -623,7 +623,7 @@ diff --git a/kernel/sched/core.c b/kernel/sched/core.c return 0; } -@@ -10580,6 +10702,8 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset) +@@ -10557,6 +10679,8 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset) cgroup_taskset_for_each(task, css, tset) sched_move_task(task); @@ -632,7 +632,7 @@ diff --git a/kernel/sched/core.c b/kernel/sched/core.c } #ifdef CONFIG_UCLAMP_TASK_GROUP -@@ -10754,6 +10878,27 @@ static int cpu_uclamp_max_show(struct seq_file *sf, void *v) +@@ -10731,6 +10855,27 @@ static int cpu_uclamp_max_show(struct seq_file *sf, void *v) cpu_uclamp_print(sf, UCLAMP_MAX); return 0; } @@ -660,7 +660,7 @@ diff --git a/kernel/sched/core.c b/kernel/sched/core.c #endif /* CONFIG_UCLAMP_TASK_GROUP */ #ifdef CONFIG_FAIR_GROUP_SCHED -@@ -11222,6 +11367,12 @@ static struct cftype cpu_legacy_files[] = { +@@ -11199,6 +11344,12 @@ static struct cftype cpu_legacy_files[] = { .seq_show = cpu_uclamp_max_show, .write = cpu_uclamp_max_write, }, @@ -673,7 +673,7 @@ diff --git a/kernel/sched/core.c b/kernel/sched/core.c #endif { } /* Terminate */ }; -@@ -11438,6 +11589,12 @@ static struct cftype cpu_files[] = { +@@ -11415,6 +11566,12 @@ static struct cftype cpu_files[] = { .seq_show = cpu_uclamp_max_show, .write = cpu_uclamp_max_write, }, |