diff options
author | Davidlohr Bueso <dave@stgolabs.net> | 2019-01-03 18:28:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-04 16:13:48 -0500 |
commit | 3bb5f4ac55dd91d516e7e36b45c94bd57efbb068 (patch) | |
tree | 10bdfc4075f94f2aae2cd48e81b4fc4dcede7556 | |
parent | 9f132f7e145506efc0744426cb338b18a54afc3b (diff) |
kernel/locking/mutex.c: remove caller signal_pending branch predictions
This is already done for us internally by the signal machinery.
Link: http://lkml.kernel.org/r/20181116002713.8474-2-dave@stgolabs.net
Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/locking/mutex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 3f8a35104285..db578783dd36 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c | |||
@@ -987,7 +987,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, | |||
987 | * wait_lock. This ensures the lock cancellation is ordered | 987 | * wait_lock. This ensures the lock cancellation is ordered |
988 | * against mutex_unlock() and wake-ups do not go missing. | 988 | * against mutex_unlock() and wake-ups do not go missing. |
989 | */ | 989 | */ |
990 | if (unlikely(signal_pending_state(state, current))) { | 990 | if (signal_pending_state(state, current)) { |
991 | ret = -EINTR; | 991 | ret = -EINTR; |
992 | goto err; | 992 | goto err; |
993 | } | 993 | } |