lkml.org 
[lkml]   [2011]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/13] x86/ticketlocks: tidy up __ticket_unlock_kick()
    Date
    From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

    __ticket_unlock_kick() is now only called from known slowpaths, so there's
    no need for it to do any checking of its own.

    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/include/asm/paravirt.h | 2 +-
    arch/x86/include/asm/spinlock.h | 14 --------------
    2 files changed, 1 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
    index 622f3d6..b89699a 100644
    --- a/arch/x86/include/asm/paravirt.h
    +++ b/arch/x86/include/asm/paravirt.h
    @@ -746,7 +746,7 @@ static inline void __ticket_lock_spinning(struct arch_spinlock *lock, unsigned t
    PVOP_VCALLEE2(pv_lock_ops.lock_spinning, lock, ticket);
    }

    -static inline void ____ticket_unlock_kick(struct arch_spinlock *lock, unsigned ticket)
    +static inline void __ticket_unlock_kick(struct arch_spinlock *lock, unsigned ticket)
    {
    PVOP_VCALL2(pv_lock_ops.unlock_kick, lock, ticket);
    }
    diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
    index 2135a48..365d787 100644
    --- a/arch/x86/include/asm/spinlock.h
    +++ b/arch/x86/include/asm/spinlock.h
    @@ -78,23 +78,9 @@ static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock, u
    {
    }

    -static __always_inline void ____ticket_unlock_kick(struct arch_spinlock *lock, unsigned ticket)
    -{
    -}
    -
    #endif /* CONFIG_PARAVIRT_SPINLOCKS */


    -/*
    - * If a spinlock has someone waiting on it, then kick the appropriate
    - * waiting cpu.
    - */
    -static __always_inline void __ticket_unlock_kick(struct arch_spinlock *lock, __ticket_t next)
    -{
    - if (unlikely(lock->tickets.tail != next))
    - ____ticket_unlock_kick(lock, next);
    -}
    -
    /*
    * Ticket locks are conceptually two parts, one indicating the current head of
    * the queue, and the other indicating the current tail. The lock is acquired
    --
    1.7.6


    \
     
     \ /
      Last update: 2011-09-02 02:59    [W:3.219 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site