renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-14 16:23:51 +08:00
Code

sched/wait: Collapse __wait_event_hrtimeout()

Browse Source 
While not a whole-sale replacement like the others we can still reduce
the size of __wait_event_hrtimeout() considerably by noting that the
actual core of __wait_event_hrtimeout() is identical to what
___wait_event() generates.

Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092528.972793648@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2013-10-02 11:22:32 +02:00 committed by Ingo Molnar
parent cf7361fd96
commit ebdc195f2e
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/wait.h
View File

@ -337,7 +337,6 @@ do { \
#define __wait_event_hrtimeout(wq, condition, timeout, state) \ #define __wait_event_hrtimeout(wq, condition, timeout, state) \
({ \ ({ \
int __ret = 0; \ int __ret = 0; \
DEFINE_WAIT(__wait); \
struct hrtimer_sleeper __t; \ struct hrtimer_sleeper __t; \
\ \
hrtimer_init_on_stack(&__t.timer, CLOCK_MONOTONIC, \ hrtimer_init_on_stack(&__t.timer, CLOCK_MONOTONIC, \
@ -348,25 +347,15 @@ do { \
current->timer_slack_ns, \ current->timer_slack_ns, \
HRTIMER_MODE_REL); \ HRTIMER_MODE_REL); \
\ \
for (;;) { \ ___wait_event(wq, condition, state, 0, __ret, \
prepare_to_wait(&wq, &__wait, state); \
if (condition) \
break; \
if (state == TASK_INTERRUPTIBLE && \
signal_pending(current)) { \
__ret = -ERESTARTSYS; \
break; \
} \
if (!__t.task) { \ if (!__t.task) { \
__ret = -ETIME; \ __ret = -ETIME; \
break; \ break; \
} \ } \
schedule(); \ schedule()); \
} \
\ \
hrtimer_cancel(&__t.timer); \ hrtimer_cancel(&__t.timer); \
destroy_hrtimer_on_stack(&__t.timer); \ destroy_hrtimer_on_stack(&__t.timer); \
finish_wait(&wq, &__wait); \
__ret; \ __ret; \
}) })