diff --git a/[refs] b/[refs] index 43c04cacd561..604822cfdd7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96814ecb404d587fade79af70bb741bc753e9ffb +refs/heads/master: e0c8ea1a69410ef44043646938a6a4175f5307e4 diff --git a/trunk/include/linux/freezer.h b/trunk/include/linux/freezer.h index a1555618801d..5989883d7763 100644 --- a/trunk/include/linux/freezer.h +++ b/trunk/include/linux/freezer.h @@ -203,6 +203,9 @@ static inline void set_freezable_with_signal(void) {} #define wait_event_freezable_timeout(wq, condition, timeout) \ wait_event_interruptible_timeout(wq, condition, timeout) +#define wait_event_freezekillable(wq, condition) \ + wait_event_killable(wq, condition) + #endif /* !CONFIG_FREEZER */ #endif /* FREEZER_H_INCLUDED */