summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2013-10-02 11:22:26 +0200
committerIngo Molnar <mingo@kernel.org>2013-10-04 10:14:49 +0200
commit48c2521717b39cb6904941ec2847d9775669207a (patch)
treeeeba0f566461e6db10208b84763747a8392739b3 /include/linux
parentc2ebb1fb4eddf3d1d66fe31d1e89e83ee211b81c (diff)
downloadlinux-stable-48c2521717b39cb6904941ec2847d9775669207a.tar.gz
linux-stable-48c2521717b39cb6904941ec2847d9775669207a.tar.bz2
linux-stable-48c2521717b39cb6904941ec2847d9775669207a.zip
sched/wait: Collapse __wait_event_interruptible_exclusive()
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.541716442@infradead.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/wait.h22
1 files changed, 2 insertions, 20 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h
index a79fb15c1dd4..c4ab172daac0 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -421,26 +421,8 @@ do { \
})
#define __wait_event_interruptible_exclusive(wq, condition, ret) \
-do { \
- __label__ __out; \
- DEFINE_WAIT(__wait); \
- \
- for (;;) { \
- prepare_to_wait_exclusive(&wq, &__wait, \
- TASK_INTERRUPTIBLE); \
- if (condition) \
- break; \
- if (signal_pending(current)) { \
- ret = -ERESTARTSYS; \
- abort_exclusive_wait(&wq, &__wait, \
- TASK_INTERRUPTIBLE, NULL); \
- goto __out; \
- } \
- schedule(); \
- } \
- finish_wait(&wq, &__wait); \
-__out: ; \
-} while (0)
+ ___wait_event(wq, condition, TASK_INTERRUPTIBLE, 1, ret, \
+ schedule())
#define wait_event_interruptible_exclusive(wq, condition) \
({ \