diff options
| author | Linus Torvalds <[email protected]> | 2018-12-05 09:51:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2018-12-05 09:51:10 -0800 |
| commit | 91dd51f6e7ce7f1eba5d7b583790e134367d0fbb (patch) | |
| tree | d42f281370551ed622fe167e28df4878630500bc | |
| parent | 5e0dc1a7ce1f322c06e993845def2c73cfc485fd (diff) | |
| parent | a72173ecfc6774cf2d55de9fb29421ce69e3428c (diff) | |
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"
| -rw-r--r-- | fs/exec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/exec.c b/fs/exec.c index acc3a5536384..fc281b738a98 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -62,7 +62,6 @@ #include <linux/oom.h> #include <linux/compat.h> #include <linux/vmalloc.h> -#include <linux/freezer.h> #include <linux/uaccess.h> #include <asm/mmu_context.h> @@ -1084,7 +1083,7 @@ static int de_thread(struct task_struct *tsk) while (sig->notify_count) { __set_current_state(TASK_KILLABLE); spin_unlock_irq(lock); - freezable_schedule(); + schedule(); if (unlikely(__fatal_signal_pending(tsk))) goto killed; spin_lock_irq(lock); @@ -1112,7 +1111,7 @@ static int de_thread(struct task_struct *tsk) __set_current_state(TASK_KILLABLE); write_unlock_irq(&tasklist_lock); cgroup_threadgroup_change_end(tsk); - freezable_schedule(); + schedule(); if (unlikely(__fatal_signal_pending(tsk))) goto killed; } |