Merge tag 'sched-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit bc1e02c3e500 · 2022-06-05T10:42:40.000-07:00
Pull scheduler fix from Thomas Gleixner:
 "Fix the fallout of sysctl code move which placed the init function
  wrong"

* tag 'sched-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/autogroup: Fix sysctl move
diff --git a/kernel/sched/autogroup.c b/kernel/sched/autogroup.c
@@ -36,6 +36,7 @@ void __init autogroup_init(struct task_struct *init_task)
 	kref_init(&autogroup_default.kref);
 	init_rwsem(&autogroup_default.lock);
 	init_task->signal->autogroup = &autogroup_default;
+	sched_autogroup_sysctl_init();
 }
 
 void autogroup_free(struct task_group *tg)
@@ -219,7 +220,6 @@ void sched_autogroup_exit(struct signal_struct *sig)
 static int __init setup_autogroup(char *str)
 {
 	sysctl_sched_autogroup_enabled = 0;
-	sched_autogroup_sysctl_init();
 
 	return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ void __init autogroup_init(struct task_struct *init_task)`
`36`	`36`	`kref_init(&autogroup_default.kref);`
`37`	`37`	`init_rwsem(&autogroup_default.lock);`
`38`	`38`	`init_task->signal->autogroup = &autogroup_default;`
	`39`	`+ sched_autogroup_sysctl_init();`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`void autogroup_free(struct task_group *tg)`
`@@ -219,7 +220,6 @@ void sched_autogroup_exit(struct signal_struct *sig)`
`219`	`220`	`static int __init setup_autogroup(char *str)`
`220`	`221`	`{`
`221`	`222`	`sysctl_sched_autogroup_enabled = 0;`
`222`		`- sched_autogroup_sysctl_init();`
`223`	`223`
`224`	`224`	`return 1;`
`225`	`225`	`}`