1 files changed, 3 insertions, 8 deletions

diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index a49b52934c55..a5386e3ee756 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -143,14 +143,9 @@ static inline void set_freezable_with_signal(void)
 #define wait_event_freezekillable(wq, condition)                        \
 ({                                                                      \
         int __retval;                                                   \
-        do {                                                            \
-                __retval = wait_event_killable(wq,                      \
-                                (condition) || freezing(current));      \
-                if (__retval && !freezing(current))                     \
-                        break;                                          \
-                else if (!(condition))                                  \
-                        __retval = -ERESTARTSYS;                        \
-        } while (try_to_freeze());                                      \
+        freezer_do_not_count();                                         \
+        __retval = wait_event_killable(wq, (condition));                \
+        freezer_count();                                                \
         __retval;                                                       \
 })