lkml.org 
[lkml]   [2014]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 14/19] pvqspinlock, x86: Rename paravirt_ticketlocks_enabled
    Date
    This patch renames the paravirt_ticketlocks_enabled static key to a
    more generic paravirt_spinlocks_enabled name.

    Signed-off-by: Waiman Long <Waiman.Long@hp.com>
    ---
    arch/x86/include/asm/spinlock.h | 4 ++--
    arch/x86/kernel/kvm.c | 2 +-
    arch/x86/kernel/paravirt-spinlocks.c | 4 ++--
    arch/x86/xen/spinlock.c | 2 +-
    4 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
    index 958d20f..428d0d1 100644
    --- a/arch/x86/include/asm/spinlock.h
    +++ b/arch/x86/include/asm/spinlock.h
    @@ -39,7 +39,7 @@
    /* How long a lock should spin before we consider blocking */
    #define SPIN_THRESHOLD (1 << 15)

    -extern struct static_key paravirt_ticketlocks_enabled;
    +extern struct static_key paravirt_spinlocks_enabled;
    static __always_inline bool static_key_false(struct static_key *key);

    #ifdef CONFIG_QUEUE_SPINLOCK
    @@ -150,7 +150,7 @@ static inline void __ticket_unlock_slowpath(arch_spinlock_t *lock,
    static __always_inline void arch_spin_unlock(arch_spinlock_t *lock)
    {
    if (TICKET_SLOWPATH_FLAG &&
    - static_key_false(&paravirt_ticketlocks_enabled)) {
    + static_key_false(&paravirt_spinlocks_enabled)) {
    arch_spinlock_t prev;

    prev = *lock;
    diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
    index 0331cb3..7ab8ab3 100644
    --- a/arch/x86/kernel/kvm.c
    +++ b/arch/x86/kernel/kvm.c
    @@ -817,7 +817,7 @@ static __init int kvm_spinlock_init_jump(void)
    if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
    return 0;

    - static_key_slow_inc(&paravirt_ticketlocks_enabled);
    + static_key_slow_inc(&paravirt_spinlocks_enabled);
    printk(KERN_INFO "KVM setup paravirtual spinlock\n");

    return 0;
    diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
    index 7dfd02d..6d36731 100644
    --- a/arch/x86/kernel/paravirt-spinlocks.c
    +++ b/arch/x86/kernel/paravirt-spinlocks.c
    @@ -17,8 +17,8 @@ struct pv_lock_ops pv_lock_ops = {
    };
    EXPORT_SYMBOL(pv_lock_ops);

    -struct static_key paravirt_ticketlocks_enabled = STATIC_KEY_INIT_FALSE;
    -EXPORT_SYMBOL(paravirt_ticketlocks_enabled);
    +struct static_key paravirt_spinlocks_enabled = STATIC_KEY_INIT_FALSE;
    +EXPORT_SYMBOL(paravirt_spinlocks_enabled);
    #endif

    #ifdef CONFIG_PARAVIRT_UNFAIR_LOCKS
    diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
    index 0ba5f3b..d1b6a32 100644
    --- a/arch/x86/xen/spinlock.c
    +++ b/arch/x86/xen/spinlock.c
    @@ -293,7 +293,7 @@ static __init int xen_init_spinlocks_jump(void)
    if (!xen_domain())
    return 0;

    - static_key_slow_inc(&paravirt_ticketlocks_enabled);
    + static_key_slow_inc(&paravirt_spinlocks_enabled);
    return 0;
    }
    early_initcall(xen_init_spinlocks_jump);
    --
    1.7.1


    \
     
     \ /
      Last update: 2014-05-07 17:41    [W:3.425 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site