Merge branch 'pm-freezer' into pm-for-linus
* pm-freezer:
PM / Freezer: fix return value of freezable_schedule_timeout_killable()
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index 7bcfe73..0ab54e1 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -116,9 +116,11 @@
/* 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; \
})
/*