Commit bc1e02c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents fa11c280 82f586f9

kernel/sched/autogroup.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}