Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91dd51f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 5e0dc1a7 a72173ec

fs/exec.c

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

		}