[<prev] [next>] [day] [month] [year] [list]
Message-ID: <163070315821.25758.10852043423900886118.tip-bot2@tip-bot2>
Date: Fri, 03 Sep 2021 21:05:58 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: locking/urgent] futex: Remove unused variable 'vpid' in
futex_proxy_trylock_atomic()
The following commit has been merged into the locking/urgent branch of tip:
Commit-ID: d66e3edee7af87fe212df611ab9846b987a5070f
Gitweb: https://git.kernel.org/tip/d66e3edee7af87fe212df611ab9846b987a5070f
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Fri, 03 Sep 2021 22:47:06 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Fri, 03 Sep 2021 23:00:22 +02:00
futex: Remove unused variable 'vpid' in futex_proxy_trylock_atomic()
The recent bug fix left the variable 'vpid' and an assignment to it around,
but the variable is otherwise unused.
clang dose not complain even with W=1, but gcc exposed this.
Fixes: 4f07ec0d76f2 ("futex: Prevent inconsistent state and exit race")
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
kernel/futex.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c
index a316dce..c15ad27 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2034,7 +2034,7 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1,
{
struct futex_q *top_waiter = NULL;
u32 curval;
- int ret, vpid;
+ int ret;
if (get_futex_value_locked(&curval, pifutex))
return -EFAULT;
@@ -2079,7 +2079,6 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1,
* the user space lock can be acquired then PI state is attached to
* the new owner (@top_waiter->task) when @set_waiters is true.
*/
- vpid = task_pid_vnr(top_waiter->task);
ret = futex_lock_pi_atomic(pifutex, hb2, key2, ps, top_waiter->task,
exiting, set_waiters);
if (ret == 1) {
Powered by blists - more mailing lists