lkml.org 
[lkml]   [2015]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/6] locking/mutex: Checking the stamp is ww only
    Date
    Mark it so by renaming __mutex_lock_check_stamp().

    Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
    ---
    kernel/locking/mutex.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
    index 4541951..b042ea5 100644
    --- a/kernel/locking/mutex.c
    +++ b/kernel/locking/mutex.c
    @@ -469,7 +469,7 @@ void __sched ww_mutex_unlock(struct ww_mutex *lock)
    EXPORT_SYMBOL(ww_mutex_unlock);

    static inline int __sched
    -__mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx)
    +__ww_mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx)
    {
    struct ww_mutex *ww = container_of(lock, struct ww_mutex, base);
    struct ww_acquire_ctx *hold_ctx = ACCESS_ONCE(ww->ctx);
    @@ -557,7 +557,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
    }

    if (use_ww_ctx && ww_ctx->acquired > 0) {
    - ret = __mutex_lock_check_stamp(lock, ww_ctx);
    + ret = __ww_mutex_lock_check_stamp(lock, ww_ctx);
    if (ret)
    goto err;
    }
    --
    2.1.2


    \
     
     \ /
      Last update: 2015-01-06 21:01    [W:4.666 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site