From: Rafael J. Wysocki Fix a bug in freezer-introduce-freezer-firendly-waiting-macros.patch which uses a wrong variable name in wait_event_freezable() and wait_event_freezable_timeout() (this name is also used in wait_event_interruptible() and wait_event_interruptible_timeout() which are macros and the names clash). Signed-off-by: Rafael J. Wysocki Signed-off-by: Andrew Morton --- include/linux/freezer.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff -puN include/linux/freezer.h~freezer-introduce-freezer-firendly-waiting-macros-fix include/linux/freezer.h --- a/include/linux/freezer.h~freezer-introduce-freezer-firendly-waiting-macros-fix +++ a/include/linux/freezer.h @@ -134,28 +134,28 @@ static inline void set_freezable(void) #define wait_event_freezable(wq, condition) \ ({ \ - int __ret; \ + int __retval; \ do { \ - __ret = wait_event_interruptible(wq, \ + __retval = wait_event_interruptible(wq, \ (condition) || freezing(current)); \ - if (__ret && !freezing(current)) \ + if (__retval && !freezing(current)) \ break; \ else if (!(condition)) \ - __ret = -ERESTARTSYS; \ + __retval = -ERESTARTSYS; \ } while (try_to_freeze()); \ - __ret; \ + __retval; \ }) #define wait_event_freezable_timeout(wq, condition, timeout) \ ({ \ - long __ret = timeout; \ + long __retval = timeout; \ do { \ - __ret = wait_event_interruptible_timeout(wq, \ + __retval = wait_event_interruptible_timeout(wq, \ (condition) || freezing(current), \ - __ret); \ + __retval); \ } while (try_to_freeze()); \ - __ret; \ + __retval; \ }) #else /* !CONFIG_PM_SLEEP */ static inline int frozen(struct task_struct *p) { return 0; } _