From: Boqun Feng <boqun.feng@gmail.com>
To: Ingo Molnar <mingo@kernel.org>, Peter Zijlstra <peterz@infradead.org>
Cc: "Will Deacon" <will@kernel.org>,
"Waiman Long" <longman@redhat.com>,
Miguel Ojeda <ojeda@kernel.org>,
Alice Ryhl <aliceryhl@google.com>,
linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org,
Breno Leitao <leitao@debian.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
Ran Xiaokai <ran.xiaokai@zte.com.cn>,
Boqun Feng <boqun.feng@gmail.com>
Subject: [PATCH 8/9] locking/mutex: Remove redundant #ifdefs
Date: Wed, 16 Jul 2025 07:48:17 -0700 [thread overview]
Message-ID: <20250716144818.47650-9-boqun.feng@gmail.com> (raw)
In-Reply-To: <20250716144818.47650-1-boqun.feng@gmail.com>
From: Ran Xiaokai <ran.xiaokai@zte.com.cn>
hung_task_{set,clear}_blocker() is already guarded by
CONFIG_DETECT_HUNG_TASK_BLOCKER in hung_task.h, So remove
the redudant check of #ifdef.
Signed-off-by: Ran Xiaokai <ran.xiaokai@zte.com.cn>
Acked-by: Waiman Long <longman@redhat.com>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Link: https://lore.kernel.org/r/20250704015218.359754-1-ranxiaokai627@163.com
---
kernel/locking/mutex.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index a39ecccbd106..d4210dc97b6a 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -191,9 +191,7 @@ static void
__mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
struct list_head *list)
{
-#ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER
hung_task_set_blocker(lock, BLOCKER_TYPE_MUTEX);
-#endif
debug_mutex_add_waiter(lock, waiter, current);
list_add_tail(&waiter->list, list);
@@ -209,9 +207,7 @@ __mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter)
__mutex_clear_flag(lock, MUTEX_FLAGS);
debug_mutex_remove_waiter(lock, waiter, current);
-#ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER
hung_task_clear_blocker();
-#endif
}
/*
--
2.39.5 (Apple Git-154)
next prev parent reply other threads:[~2025-07-16 14:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-16 14:48 [GIT PULL] [PATCH 0/9] Locking changes for v6.17 Boqun Feng
2025-07-16 14:48 ` [PATCH 1/9] spi: spi-nxp-fspi: Check return value of devm_mutex_init() Boqun Feng
2025-07-16 14:48 ` [PATCH 2/9] leds: lp8860: " Boqun Feng
2025-07-16 14:48 ` [PATCH 3/9] locking/mutex: Mark devm_mutex_init() as __must_check Boqun Feng
2025-07-16 14:48 ` [PATCH 4/9] rust: sync: Add #[must_use] to Lock::try_lock() Boqun Feng
2025-07-16 14:48 ` [PATCH 5/9] locking/rwsem: Use OWNER_NONSPINNABLE directly instead of OWNER_SPINNABLE Boqun Feng
2025-07-16 14:48 ` [PATCH 6/9] locking/lockdep: Avoid struct return in lock_stats() Boqun Feng
2025-07-16 14:48 ` [PATCH 7/9] locking/lockdep: Change 'static const' variables to enum values Boqun Feng
2025-07-16 14:48 ` Boqun Feng [this message]
2025-07-16 14:48 ` [PATCH 9/9] lockdep: Speed up lockdep_unregister_key() with expedited RCU synchronization Boqun Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250716144818.47650-9-boqun.feng@gmail.com \
--to=boqun.feng@gmail.com \
--cc=aliceryhl@google.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@kernel.org \
--cc=ojeda@kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=ran.xiaokai@zte.com.cn \
--cc=rust-for-linux@vger.kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®