diff --git a/[refs] b/[refs] index 52e726868900..218ed37c1edc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbcae3ea169189ee49dc6820478cb1d069b80a08 +refs/heads/master: b957ae9c53d5715a07f8bac644d8ff0a407c7e07 diff --git a/trunk/include/linux/freezer.h b/trunk/include/linux/freezer.h index 3672f731f03a..a1555618801d 100644 --- a/trunk/include/linux/freezer.h +++ b/trunk/include/linux/freezer.h @@ -143,7 +143,7 @@ static inline void set_freezable_with_signal(void) ({ \ int __retval; \ do { \ - __retval = wait_event_killable(wq, \ + __retval = wait_event_killable(wq, \ (condition) || freezing(current)); \ if (__retval && !freezing(current)) \ break; \