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

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

* pm-freezer:
  PM / Freezer: fix return value of freezable_schedule_timeout_killable()
parents 6d10463b b3b73ec0
...@@ -116,9 +116,11 @@ static inline int freezer_should_skip(struct task_struct *p) ...@@ -116,9 +116,11 @@ static inline int freezer_should_skip(struct task_struct *p)
/* Like schedule_timeout_killable(), but should not block the freezer. */ /* Like schedule_timeout_killable(), but should not block the freezer. */
#define freezable_schedule_timeout_killable(timeout) \ #define freezable_schedule_timeout_killable(timeout) \
({ \ ({ \
long __retval; \
freezer_do_not_count(); \ freezer_do_not_count(); \
schedule_timeout_killable(timeout); \ __retval = schedule_timeout_killable(timeout); \
freezer_count(); \ freezer_count(); \
__retval; \
}) })
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment