Skip to content

Commit 91dd51f

Browse files
committed
Merge tag 'pm-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki: "Revert a problematic recent commit that attempted to fix a system-wide suspend issue related to the freezer" * tag 'pm-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: Revert "exec: make de_thread() freezable"
2 parents 5e0dc1a + a72173e commit 91dd51f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

fs/exec.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
#include <linux/oom.h>
6363
#include <linux/compat.h>
6464
#include <linux/vmalloc.h>
65-
#include <linux/freezer.h>
6665

6766
#include <linux/uaccess.h>
6867
#include <asm/mmu_context.h>
@@ -1084,7 +1083,7 @@ static int de_thread(struct task_struct *tsk)
10841083
while (sig->notify_count) {
10851084
__set_current_state(TASK_KILLABLE);
10861085
spin_unlock_irq(lock);
1087-
freezable_schedule();
1086+
schedule();
10881087
if (unlikely(__fatal_signal_pending(tsk)))
10891088
goto killed;
10901089
spin_lock_irq(lock);
@@ -1112,7 +1111,7 @@ static int de_thread(struct task_struct *tsk)
11121111
__set_current_state(TASK_KILLABLE);
11131112
write_unlock_irq(&tasklist_lock);
11141113
cgroup_threadgroup_change_end(tsk);
1115-
freezable_schedule();
1114+
schedule();
11161115
if (unlikely(__fatal_signal_pending(tsk)))
11171116
goto killed;
11181117
}

0 commit comments

Comments
 (0)