sched/wait: Collapse __wait_event_lock_irq()

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.612813379@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2013-10-02 11:22:27 +02:00 committed by Ingo Molnar
parent 48c2521717
commit 13cb5042a4

View File

@ -624,20 +624,12 @@ do { \
#define __wait_event_lock_irq(wq, condition, lock, cmd) \ #define __wait_event_lock_irq(wq, condition, lock, cmd) \
do { \ ___wait_event(wq, condition, TASK_UNINTERRUPTIBLE, 0, \
DEFINE_WAIT(__wait); \ ___wait_nop_ret, \
\ spin_unlock_irq(&lock); \
for (;;) { \ cmd; \
prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \ schedule(); \
if (condition) \ spin_lock_irq(&lock))
break; \
spin_unlock_irq(&lock); \
cmd; \
schedule(); \
spin_lock_irq(&lock); \
} \
finish_wait(&wq, &__wait); \
} while (0)
/** /**
* wait_event_lock_irq_cmd - sleep until a condition gets true. The * wait_event_lock_irq_cmd - sleep until a condition gets true. The