[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250530075136.11842-1-pbonzini@redhat.com>
Date: Fri, 30 May 2025 03:51:36 -0400
From: Paolo Bonzini <pbonzini@...hat.com>
To: linux-kernel@...r.kernel.org,
kvm@...r.kernel.org
Cc: Randy Dunlap <rdunlap@...radead.org>,
Peter Zijlstra <peterz@...radead.org>
Subject: [PATCH] rtmutex_api: remove definition of mutex_lock_killable_nested
Commit fb49f07ba1d9 ("locking/mutex: implement mutex_lock_killable_nest_lock")
removed the "extern" declaration of mutex_lock_killable_nested from
include/linux/mutex.h, and replaced it with a macro since it could be
treated as a special case of _mutex_lock_killable. It also removed a
definition of the function in kernel/locking/mutex.c.
However, it left the definition in place in kernel/locking/rtmutex_api.c,
which causes a failure when building with CONFIG_RT_MUTEXES=y. Drop it as
well now.
Fixes: fb49f07ba1d9 ("locking/mutex: implement mutex_lock_killable_nest_lock")
Reported-by: Randy Dunlap <rdunlap@...radead.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Signed-off-by: Paolo Bonzini <pbonzini@...hat.com>
---
kernel/locking/rtmutex_api.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/kernel/locking/rtmutex_api.c b/kernel/locking/rtmutex_api.c
index 191e4720e546..0c26b52dd417 100644
--- a/kernel/locking/rtmutex_api.c
+++ b/kernel/locking/rtmutex_api.c
@@ -544,13 +544,6 @@ int __sched mutex_lock_interruptible_nested(struct mutex *lock,
}
EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested);
-int __sched mutex_lock_killable_nested(struct mutex *lock,
- unsigned int subclass)
-{
- return __mutex_lock_common(lock, TASK_KILLABLE, subclass, NULL, _RET_IP_);
-}
-EXPORT_SYMBOL_GPL(mutex_lock_killable_nested);
-
void __sched mutex_lock_io_nested(struct mutex *lock, unsigned int subclass)
{
int token;
--
2.43.5
Powered by blists - more mailing lists