Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[~andy/linux] / include / linux / freezer.h

diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index 7bcfe73d999b351eca24c36a70d0f2398f1e59d5..0ab54e16a91f499b37db61fcd2be564232144a4a 100644 (file)
--- 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;                                                       \
 })
 
 /*