Skip to content

Commit de620fb

Browse files
committed
Merge branch 'for-5.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo: "There's an inadvertent preemption point in ptrace_stop() which was reliably triggering for a test scenario significantly slowing it down. This contains Oleg's fix to remove the unwanted preemption point" * 'for-5.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop()
2 parents 72d5ac6 + 937c6b2 commit de620fb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2205,8 +2205,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, kernel_siginfo_t
22052205
*/
22062206
preempt_disable();
22072207
read_unlock(&tasklist_lock);
2208-
preempt_enable_no_resched();
22092208
cgroup_enter_frozen();
2209+
preempt_enable_no_resched();
22102210
freezable_schedule();
22112211
cgroup_leave_frozen(true);
22122212
} else {

0 commit comments

Comments
 (0)