Skip to content

Commit

Permalink
sched/wait: Collapse __wait_event_interruptible_exclusive()
Browse files Browse the repository at this point in the history
Reduce macro complexity by using the new ___wait_event() helper.
No change in behaviour, identical generated code.

Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092528.541716442@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Oct 4, 2013
1 parent c2ebb1f commit 48c2521
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions include/linux/wait.h
Original file line number Diff line number Diff line change
Expand Up @@ -421,26 +421,8 @@ do { \
})

#define __wait_event_interruptible_exclusive(wq, condition, ret) \
do { \
__label__ __out; \
DEFINE_WAIT(__wait); \
\
for (;;) { \
prepare_to_wait_exclusive(&wq, &__wait, \
TASK_INTERRUPTIBLE); \
if (condition) \
break; \
if (signal_pending(current)) { \
ret = -ERESTARTSYS; \
abort_exclusive_wait(&wq, &__wait, \
TASK_INTERRUPTIBLE, NULL); \
goto __out; \
} \
schedule(); \
} \
finish_wait(&wq, &__wait); \
__out: ; \
} while (0)
___wait_event(wq, condition, TASK_INTERRUPTIBLE, 1, ret, \
schedule())

#define wait_event_interruptible_exclusive(wq, condition) \
({ \
Expand Down

0 comments on commit 48c2521

Please sign in to comment.