[tip: locking/core] locking/mutex: Remove redundant #ifdefs
From: tip-bot2 for Ran Xiaokai
Date: Sat Jul 19 2025 - 13:40:29 EST
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 1dfe5ea6dbb3e03073f5426d65394694683b8692
Gitweb: https://git.kernel.org/tip/1dfe5ea6dbb3e03073f5426d65394694683b8692
Author: Ran Xiaokai <ran.xiaokai@xxxxxxxxxx>
AuthorDate: Fri, 04 Jul 2025 01:52:18
Committer: Boqun Feng <boqun.feng@xxxxxxxxx>
CommitterDate: Mon, 14 Jul 2025 21:57:29 -07:00
locking/mutex: Remove redundant #ifdefs
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@xxxxxxxxxx>
Acked-by: Waiman Long <longman@xxxxxxxxxx>
Signed-off-by: Boqun Feng <boqun.feng@xxxxxxxxx>
Link: https://lore.kernel.org/r/20250704015218.359754-1-ranxiaokai627@xxxxxxx
---
kernel/locking/mutex.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index a39eccc..d4210dc 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
}
/*