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

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

sched/wait: Collapse __wait_event_interruptible_tty() 



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.831085521@infradead.org


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

include/linux/tty.h

+4 −17
Original line number Diff line number Diff line
@@ -679,23 +679,10 @@ static inline void tty_wait_until_sent_from_close(struct tty_struct *tty, 
})



#define __wait_event_interruptible_tty(tty, wq, condition, ret)		\

do {									\

	DEFINE_WAIT(__wait);						\

									\

	for (;;) {							\

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

		if (condition)						\

			break;						\

		if (signal_pending(current)) {				\

			ret = -ERESTARTSYS;				\

			break;						\

		}							\

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

			tty_unlock(tty);				\

			schedule();					\

		tty_lock(tty);						\

	}								\

	finish_wait(&wq, &__wait);					\

} while (0)

			tty_lock(tty))



#ifdef CONFIG_PROC_FS

extern void proc_tty_register_driver(struct tty_driver *);