[GIT pull] sched/urgent for v5.19-rc1

Thomas Gleixner posted 1 patch 3 years, 10 months ago
kernel/sched/autogroup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[GIT pull] sched/urgent for v5.19-rc1
Posted by Thomas Gleixner 3 years, 10 months ago
Linus,

please pull the latest sched/urgent branch from:

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

up to:  82f586f923e3: sched/autogroup: Fix sysctl move


Fix the fallout of sysctl code move which placed the init function wrong.

Thanks,

	tglx

------------------>
Peter Zijlstra (1):
      sched/autogroup: Fix sysctl move


 kernel/sched/autogroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/autogroup.c b/kernel/sched/autogroup.c
index 16092b49ff6a..4ebaf97f7bd8 100644
--- 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;
 }
Re: [GIT pull] sched/urgent for v5.19-rc1
Posted by pr-tracker-bot@kernel.org 3 years, 10 months ago
The pull request you sent on Sun,  5 Jun 2022 11:30:55 +0200 (CEST):

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-2022-06-05

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/bc1e02c3e500e2eec5afd2fd3efc3b7f9637c35c

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html