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

Commit 9ec23949 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-freezer' into pm-for-linus 

* pm-freezer:
  PM / Freezer: fix return value of freezable_schedule_timeout_killable()
parents 6d10463b b3b73ec0

include/linux/freezer.h

+3 −1
Original line number Diff line number Diff line
@@ -116,9 +116,11 @@ static inline int freezer_should_skip(struct task_struct *p) 
/* Like schedule_timeout_killable(), but should not block the freezer. */

#define freezable_schedule_timeout_killable(timeout)			\

({									\

	long __retval;							\

	freezer_do_not_count();						\

	schedule_timeout_killable(timeout);				\

	__retval = schedule_timeout_killable(timeout);			\

	freezer_count();						\

	__retval;							\

})



/*