[patch V4 42/68] locking/ww_mutex: Remove __sched annotation
From: Thomas Gleixner
Date: Wed Aug 11 2021 - 08:25:53 EST
From: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
None of these functions will be on the stack when blocking in
schedule(), hence __sched is not needed.
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
kernel/locking/ww_mutex.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
--- a/kernel/locking/ww_mutex.h
+++ b/kernel/locking/ww_mutex.h
@@ -62,7 +62,7 @@ ww_mutex_lock_acquired(struct ww_mutex *
* transaction than @b and depending on algorithm either needs to wait for
* @b or die.
*/
-static inline bool __sched
+static inline bool
__ww_ctx_stamp_after(struct ww_acquire_ctx *a, struct ww_acquire_ctx *b)
{
@@ -77,7 +77,7 @@ static inline bool __sched
* already (ctx->acquired > 0), because __ww_mutex_add_waiter() and
* __ww_mutex_check_kill() wake any but the earliest context.
*/
-static bool __sched
+static bool
__ww_mutex_die(struct mutex *lock, struct mutex_waiter *waiter,
struct ww_acquire_ctx *ww_ctx)
{
@@ -154,7 +154,7 @@ static bool __ww_mutex_wound(struct mute
*
* The current task must not be on the wait list.
*/
-static void __sched
+static void
__ww_mutex_check_waiters(struct mutex *lock, struct ww_acquire_ctx *ww_ctx)
{
struct mutex_waiter *cur;
@@ -210,7 +210,7 @@ ww_mutex_set_context_fastpath(struct ww_
raw_spin_unlock(&lock->base.wait_lock);
}
-static __always_inline int __sched
+static __always_inline int
__ww_mutex_kill(struct mutex *lock, struct ww_acquire_ctx *ww_ctx)
{
if (ww_ctx->acquired > 0) {
@@ -238,7 +238,7 @@ static __always_inline int __sched
* Since __ww_mutex_add_waiter() orders the wait-list on stamp, we only have to
* look at waiters before us in the wait-list.
*/
-static inline int __sched
+static inline int
__ww_mutex_check_kill(struct mutex *lock, struct mutex_waiter *waiter,
struct ww_acquire_ctx *ctx)
{
@@ -285,7 +285,7 @@ static inline int __sched
* older contexts already waiting) to avoid unnecessary waiting and for
* Wound-Wait ensure we wound the owning context when it is younger.
*/
-static inline int __sched
+static inline int
__ww_mutex_add_waiter(struct mutex_waiter *waiter,
struct mutex *lock,
struct ww_acquire_ctx *ww_ctx)