Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1dc6852 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/wait: Collapse __wait_event_interruptible_lock_irq_timeout() 



Reduce macro complexity by using the new ___wait_event() helper.
No change in behaviour, identical generated code.

Reviewed-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092528.759956109@infradead.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 8fbd88fa

include/linux/wait.h

+6 −19
Original line number Diff line number Diff line
@@ -763,25 +763,12 @@ do { \ 
	__ret;								\

})



#define __wait_event_interruptible_lock_irq_timeout(wq, condition,	\

						    lock, ret)		\

do {									\

	DEFINE_WAIT(__wait);						\

									\

	for (;;) {							\

		prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE);	\

		if (___wait_cond_timeout(condition, ret))		\

			break;						\

		if (signal_pending(current)) {				\

			ret = -ERESTARTSYS;				\

			break;						\

		}							\

#define __wait_event_interruptible_lock_irq_timeout(wq, condition, lock, ret) \

	___wait_event(wq, ___wait_cond_timeout(condition, ret),		      \

		      TASK_INTERRUPTIBLE, 0, ret,	      		      \

		      spin_unlock_irq(&lock);				      \

		      ret = schedule_timeout(ret);			      \

		spin_lock_irq(&lock);					\

	}								\

	finish_wait(&wq, &__wait);					\

} while (0)

		      spin_lock_irq(&lock));



/**

 * wait_event_interruptible_lock_irq_timeout - sleep until a condition gets true or a timeout elapses.