lkml.org 
[lkml]   [2021]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: locking/core] locking/rtmutex: Move rt_mutex_debug_task_free() to rtmutex.c
    The following commit has been merged into the locking/core branch of tip:

    Commit-ID: 1238b7032101ba420a114f64b86a8e3de609d0e8
    Gitweb: https://git.kernel.org/tip/1238b7032101ba420a114f64b86a8e3de609d0e8
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Tue, 23 Mar 2021 22:30:25 +01:00
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitterDate: Wed, 24 Mar 2021 08:06:07 +01:00

    locking/rtmutex: Move rt_mutex_debug_task_free() to rtmutex.c

    Prepare for removing the header maze.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Link: https://lore.kernel.org/r/20210323213708.096477462@linutronix.de
    ---
    kernel/locking/rtmutex-debug.c | 6 ------
    kernel/locking/rtmutex.c | 8 ++++++++
    2 files changed, 8 insertions(+), 6 deletions(-)

    diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c
    index df584c9..f1a83ec 100644
    --- a/kernel/locking/rtmutex-debug.c
    +++ b/kernel/locking/rtmutex-debug.c
    @@ -32,12 +32,6 @@

    #include "rtmutex_common.h"

    -void rt_mutex_debug_task_free(struct task_struct *task)
    -{
    - DEBUG_LOCKS_WARN_ON(!RB_EMPTY_ROOT(&task->pi_waiters.rb_root));
    - DEBUG_LOCKS_WARN_ON(task->pi_blocked_on);
    -}
    -
    void debug_rt_mutex_unlock(struct rt_mutex *lock)
    {
    DEBUG_LOCKS_WARN_ON(rt_mutex_owner(lock) != current);
    diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
    index 82cb963..a18ee0c 100644
    --- a/kernel/locking/rtmutex.c
    +++ b/kernel/locking/rtmutex.c
    @@ -1814,3 +1814,11 @@ bool rt_mutex_cleanup_proxy_lock(struct rt_mutex *lock,

    return cleanup;
    }
    +
    +#ifdef CONFIG_DEBUG_RT_MUTEXES
    +void rt_mutex_debug_task_free(struct task_struct *task)
    +{
    + DEBUG_LOCKS_WARN_ON(!RB_EMPTY_ROOT(&task->pi_waiters.rb_root));
    + DEBUG_LOCKS_WARN_ON(task->pi_blocked_on);
    +}
    +#endif
    \
     
     \ /
      Last update: 2021-03-24 08:40    [W:4.052 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site