lkml.org 
[lkml]   [2014]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 09/11] pvqspinlock, x86: Rename paravirt_ticketlocks_enabled
On Sun, Jun 15, 2014 at 02:47:06PM +0200, Peter Zijlstra wrote:
> From: Waiman Long <Waiman.Long@hp.com>
>
> 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>
> Signed-off-by: Peter Zijlstra <peterz@infradead.org>

Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.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(-)
>
> --- 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_slowp
> 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;
> --- a/arch/x86/kernel/kvm.c
> +++ b/arch/x86/kernel/kvm.c
> @@ -819,7 +819,7 @@ static __init int kvm_spinlock_init_jump
> 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;
> --- a/arch/x86/kernel/paravirt-spinlocks.c
> +++ b/arch/x86/kernel/paravirt-spinlocks.c
> @@ -16,5 +16,5 @@ 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);
> --- a/arch/x86/xen/spinlock.c
> +++ b/arch/x86/xen/spinlock.c
> @@ -293,7 +293,7 @@ static __init int xen_init_spinlocks_jum
> 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);
>
>


\
 
 \ /
  Last update: 2014-06-18 22:21    [W:0.331 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site