diff options
author | Peter Zijlstra <peterz@infradead.org> | 2017-03-22 06:35:56 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-03-23 14:10:09 -0400 |
commit | 50809358dd7199aa7ce232f6877dd09ec30ef374 (patch) | |
tree | a8f847cba791b1f9585330789fa230e7abfb762f /kernel/futex.c | |
parent | 16ffa12d742534d4ff73e8b3a4e81c1de39196f0 (diff) |
futex,rt_mutex: Introduce rt_mutex_init_waiter()
Since there's already two copies of this code, introduce a helper now
before adding a third one.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: juri.lelli@arm.com
Cc: bigeasy@linutronix.de
Cc: xlpang@redhat.com
Cc: rostedt@goodmis.org
Cc: mathieu.desnoyers@efficios.com
Cc: jdesfossez@efficios.com
Cc: dvhart@infradead.org
Cc: bristot@redhat.com
Link: http://lkml.kernel.org/r/20170322104151.950039479@infradead.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 3b0aace334a8..f03ff63326d7 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -2956,10 +2956,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, | |||
2956 | * The waiter is allocated on our stack, manipulated by the requeue | 2956 | * The waiter is allocated on our stack, manipulated by the requeue |
2957 | * code while we sleep on uaddr. | 2957 | * code while we sleep on uaddr. |
2958 | */ | 2958 | */ |
2959 | debug_rt_mutex_init_waiter(&rt_waiter); | 2959 | rt_mutex_init_waiter(&rt_waiter); |
2960 | RB_CLEAR_NODE(&rt_waiter.pi_tree_entry); | ||
2961 | RB_CLEAR_NODE(&rt_waiter.tree_entry); | ||
2962 | rt_waiter.task = NULL; | ||
2963 | 2960 | ||
2964 | ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE); | 2961 | ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE); |
2965 | if (unlikely(ret != 0)) | 2962 | if (unlikely(ret != 0)) |