summaryrefslogtreecommitdiff
path: root/include/linux/wait.h
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2016-09-08 19:48:15 +0300
committerIngo Molnar <mingo@kernel.org>2016-09-30 11:53:44 +0300
commitb1ea06a90f528e516929a4da1d9b8838752bceb9 (patch)
treeca58fca505c7411b393047842c0eaedfe7c4ead0 /include/linux/wait.h
parent38a3e1fc1dac480f3672ab22fc97e1f995c80ed7 (diff)
downloadlinux-b1ea06a90f528e516929a4da1d9b8838752bceb9.tar.xz
sched/wait: Avoid abort_exclusive_wait() in ___wait_event()
___wait_event() doesn't really need abort_exclusive_wait(), we can simply change prepare_to_wait_event() to remove the waiter from q->task_list if it was interrupted. This simplifies the code/logic, and this way prepare_to_wait_event() can have more users, see the next change. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Al Viro <viro@ZenIV.linux.org.uk> Cc: Bart Van Assche <bvanassche@acm.org> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Neil Brown <neilb@suse.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20160908164815.GA18801@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org> -- include/linux/wait.h | 7 +------ kernel/sched/wait.c | 35 +++++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 16 deletions(-)
Diffstat (limited to 'include/linux/wait.h')
-rw-r--r--include/linux/wait.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h
index e4cfd1ed726e..7261dcbe5afe 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -280,12 +280,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);
\
if (___wait_is_interruptible(state) && __int) { \
__ret = __int; \
- if (exclusive) { \
- abort_exclusive_wait(&wq, &__wait, \
- NULL); \
- goto __out; \
- } \
- break; \
+ goto __out; \
} \
\
cmd; \