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

* pm-freezer: PM / Freezer: fix return value of freezable_schedule_timeout_killable()
2011-12-27 22:53:53 +01:00 · 2011-12-27 22:53:53 +01:00 · 9ec23949a2
parent 6d10463b2f b3b73ec0d7
commit 9ec23949a2
1 changed files with 3 additions and 1 deletions
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@ -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;							\
 })

 /*