sched/wait: Collapse __wait_event_interruptible_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.686006009@infradead.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
13cb5042a4
commit
8fbd88fa17
|
@ -689,26 +689,12 @@ do { \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
#define __wait_event_interruptible_lock_irq(wq, condition, \
|
#define __wait_event_interruptible_lock_irq(wq, condition, lock, ret, cmd) \
|
||||||
lock, ret, cmd) \
|
___wait_event(wq, condition, TASK_INTERRUPTIBLE, 0, ret, \
|
||||||
do { \
|
spin_unlock_irq(&lock); \
|
||||||
DEFINE_WAIT(__wait); \
|
cmd; \
|
||||||
\
|
schedule(); \
|
||||||
for (;;) { \
|
spin_lock_irq(&lock))
|
||||||
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
|
|
||||||
if (condition) \
|
|
||||||
break; \
|
|
||||||
if (signal_pending(current)) { \
|
|
||||||
ret = -ERESTARTSYS; \
|
|
||||||
break; \
|
|
||||||
} \
|
|
||||||
spin_unlock_irq(&lock); \
|
|
||||||
cmd; \
|
|
||||||
schedule(); \
|
|
||||||
spin_lock_irq(&lock); \
|
|
||||||
} \
|
|
||||||
finish_wait(&wq, &__wait); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* wait_event_interruptible_lock_irq_cmd - sleep until a condition gets true.
|
* wait_event_interruptible_lock_irq_cmd - sleep until a condition gets true.
|
||||||
|
|
Loading…
Reference in New Issue