Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62c7a1e9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

locking/pvqspinlock: Rename QUEUED_SPINLOCK to QUEUED_SPINLOCKS 



Valentin Rothberg reported that we use CONFIG_QUEUED_SPINLOCKS
in arch/x86/kernel/paravirt_patch_32.c, while the symbol is
called CONFIG_QUEUED_SPINLOCK. (Note the extra 'S')

But the typo was natural: the proper English term for such
a generic object would be 'queued spinlocks' - so rename
this and related symbols accordingly to the plural form.

Reported-by: default avatarValentin Rothberg <valentinrothberg@gmail.com>
Cc: Douglas Hatch <doug.hatch@hp.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Scott J Norton <scott.norton@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <Waiman.Long@hp.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 52c9d2ba

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ config X86 
	select MODULES_USE_ELF_RELA if X86_64

	select CLONE_BACKWARDS if X86_32

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_QUEUED_SPINLOCK

	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_USE_QUEUE_RWLOCK

	select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION

	select OLD_SIGACTION if X86_32
@@ -667,7 +667,7 @@ config PARAVIRT_DEBUG 
config PARAVIRT_SPINLOCKS

	bool "Paravirtualization layer for spinlocks"

	depends on PARAVIRT && SMP

	select UNINLINE_SPIN_UNLOCK if !QUEUED_SPINLOCK

	select UNINLINE_SPIN_UNLOCK if !QUEUED_SPINLOCKS

	---help---

	  Paravirtualized spinlocks allow a pvops backend to replace the

	  spinlock implementation with something virtualization-friendly

arch/x86/include/asm/paravirt.h

+3 −3
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, 


#if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)



#ifdef CONFIG_QUEUED_SPINLOCK

#ifdef CONFIG_QUEUED_SPINLOCKS



static __always_inline void pv_queued_spin_lock_slowpath(struct qspinlock *lock,

							u32 val)
@@ -735,7 +735,7 @@ static __always_inline void pv_kick(int cpu) 
	PVOP_VCALL1(pv_lock_ops.kick, cpu);

}



#else /* !CONFIG_QUEUED_SPINLOCK */

#else /* !CONFIG_QUEUED_SPINLOCKS */



static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,

							__ticket_t ticket)
@@ -749,7 +749,7 @@ static __always_inline void __ticket_unlock_kick(struct arch_spinlock *lock, 
	PVOP_VCALL2(pv_lock_ops.unlock_kick, lock, ticket);

}



#endif /* CONFIG_QUEUED_SPINLOCK */

#endif /* CONFIG_QUEUED_SPINLOCKS */



#endif /* SMP && PARAVIRT_SPINLOCKS */

arch/x86/include/asm/paravirt_types.h

+3 −3
Original line number Diff line number Diff line
@@ -336,16 +336,16 @@ typedef u16 __ticket_t; 
struct qspinlock;



struct pv_lock_ops {

#ifdef CONFIG_QUEUED_SPINLOCK

#ifdef CONFIG_QUEUED_SPINLOCKS

	void (*queued_spin_lock_slowpath)(struct qspinlock *lock, u32 val);

	struct paravirt_callee_save queued_spin_unlock;



	void (*wait)(u8 *ptr, u8 val);

	void (*kick)(int cpu);

#else /* !CONFIG_QUEUED_SPINLOCK */

#else /* !CONFIG_QUEUED_SPINLOCKS */

	struct paravirt_callee_save lock_spinning;

	void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);

#endif /* !CONFIG_QUEUED_SPINLOCK */

#endif /* !CONFIG_QUEUED_SPINLOCKS */

};



/* This contains all the paravirt structures: we get a convenient

arch/x86/include/asm/spinlock.h

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
extern struct static_key paravirt_ticketlocks_enabled;

static __always_inline bool static_key_false(struct static_key *key);



#ifdef CONFIG_QUEUED_SPINLOCK

#ifdef CONFIG_QUEUED_SPINLOCKS

#include <asm/qspinlock.h>

#else
@@ -200,7 +200,7 @@ static inline void arch_spin_unlock_wait(arch_spinlock_t *lock) 
		cpu_relax();

	}

}

#endif /* CONFIG_QUEUED_SPINLOCK */

#endif /* CONFIG_QUEUED_SPINLOCKS */



/*

 * Read-write spinlocks, allowing multiple readers

arch/x86/include/asm/spinlock_types.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ typedef u32 __ticketpair_t; 


#define TICKET_SHIFT	(sizeof(__ticket_t) * 8)



#ifdef CONFIG_QUEUED_SPINLOCK

#ifdef CONFIG_QUEUED_SPINLOCKS

#include <asm-generic/qspinlock_types.h>

#else

typedef struct arch_spinlock {
@@ -36,7 +36,7 @@ typedef struct arch_spinlock { 
} arch_spinlock_t;



#define __ARCH_SPIN_LOCK_UNLOCKED	{ { 0 } }

#endif /* CONFIG_QUEUED_SPINLOCK */

#endif /* CONFIG_QUEUED_SPINLOCKS */



#include <asm-generic/qrwlock_types.h>