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

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

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: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092528.686006009@infradead.org


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

include/linux/wait.h

+6 −20
Original line number Diff line number Diff line
@@ -689,26 +689,12 @@ do { \ 
} while (0)





#define __wait_event_interruptible_lock_irq(wq, condition,		\

					    lock, ret, cmd)		\

do {									\

	DEFINE_WAIT(__wait);						\

									\

	for (;;) {							\

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

		if (condition)						\

			break;						\

		if (signal_pending(current)) {				\

			ret = -ERESTARTSYS;				\

			break;						\

		}							\

#define __wait_event_interruptible_lock_irq(wq, condition, lock, ret, cmd) \

	___wait_event(wq, condition, TASK_INTERRUPTIBLE, 0, ret,	   \

		      spin_unlock_irq(&lock);				   \

		      cmd;						   \

		      schedule();					   \

		spin_lock_irq(&lock);					\

	}								\

	finish_wait(&wq, &__wait);					\

} while (0)

		      spin_lock_irq(&lock))



/**

 * wait_event_interruptible_lock_irq_cmd - sleep until a condition gets true.