diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-27 21:53:53 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-27 21:53:53 (GMT) |
| commit | 9ec23949a2d1cb2574c5ec927ccab6dc5685e5f9 (patch) | |
| tree | ed9a77b6444542c090a0ac404de1a4d87f37368e | |
| parent | 6d10463b2fa1b6b81091661c1917f26436b38c53 (diff) | |
| parent | b3b73ec0d7fe5bf8f950232aa58dfa0416a62372 (diff) | |
| download | linux-9ec23949a2d1cb2574c5ec927ccab6dc5685e5f9.tar.xz | |
Merge branch 'pm-freezer' into pm-for-linus
* pm-freezer:
PM / Freezer: fix return value of freezable_schedule_timeout_killable()
| -rw-r--r-- | include/linux/freezer.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ 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; \ }) /* |