lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 10/43] rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
    Date
    From: Thomas Gleixner <tglx@linutronix.de>

    [ Upstream commit 2156ac1934166d6deb6cd0f6ffc4c1076ec63697 ]
    Nothing uses the argument. Remove it as preparation to use
    pi_state_update_owner().

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: stable@vger.kernel.org
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    kernel/futex.c | 2 +-
    kernel/locking/rtmutex.c | 3 +--
    kernel/locking/rtmutex_common.h | 3 +--
    3 files changed, 3 insertions(+), 5 deletions(-)

    --- a/kernel/futex.c
    +++ b/kernel/futex.c
    @@ -883,7 +883,7 @@ static void put_pi_state(struct futex_pi
    list_del_init(&pi_state->list);
    raw_spin_unlock_irq(&pi_state->owner->pi_lock);

    - rt_mutex_proxy_unlock(&pi_state->pi_mutex, pi_state->owner);
    + rt_mutex_proxy_unlock(&pi_state->pi_mutex);
    }

    if (current->pi_state_cache)
    --- a/kernel/locking/rtmutex.c
    +++ b/kernel/locking/rtmutex.c
    @@ -1696,8 +1696,7 @@ void rt_mutex_init_proxy_locked(struct r
    * No locking. Caller has to do serializing itself
    * Special API call for PI-futex support
    */
    -void rt_mutex_proxy_unlock(struct rt_mutex *lock,
    - struct task_struct *proxy_owner)
    +void rt_mutex_proxy_unlock(struct rt_mutex *lock)
    {
    debug_rt_mutex_proxy_unlock(lock);
    rt_mutex_set_owner(lock, NULL);
    --- a/kernel/locking/rtmutex_common.h
    +++ b/kernel/locking/rtmutex_common.h
    @@ -102,8 +102,7 @@ enum rtmutex_chainwalk {
    extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
    extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
    struct task_struct *proxy_owner);
    -extern void rt_mutex_proxy_unlock(struct rt_mutex *lock,
    - struct task_struct *proxy_owner);
    +extern void rt_mutex_proxy_unlock(struct rt_mutex *lock);
    extern int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
    struct rt_mutex_waiter *waiter,
    struct task_struct *task);

    \
     
     \ /
      Last update: 2021-02-08 16:35    [W:3.483 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site