x86, spinlock: Remove obsolete ticket spinlock macros and types
Subsystems (2)
Waiman Long
reviewerPATCH 1/1 x86, spinlock: Remove obsolete ticket spinlock macros and types
Even though the x86 ticket spinlock code has been removed in the commit cfd8983f03c7 ("x86, locking/spinlocks: Remove ticket (spin)lock implementation") a while ago, there are still some ticket spinlock specific macros and types left in the asm/spinlock_types.h header file that are no longer used. Remove those as well to avoid confusion.
--- arch/x86/include/asm/spinlock_types.h | 22 ---------------------- 1 file changed, 22 deletions(-)
arch/x86/include/asm/spinlock_types.h +0 -22
@@ -3,29 +3,7 @@#define _ASM_X86_SPINLOCK_TYPES_H#include <linux/types.h> - -#ifdef CONFIG_PARAVIRT_SPINLOCKS -#define __TICKET_LOCK_INC 2 -#define TICKET_SLOWPATH_FLAG ((__ticket_t)1) -#else -#define __TICKET_LOCK_INC 1 -#define TICKET_SLOWPATH_FLAG ((__ticket_t)0) -#endif - -#if (CONFIG_NR_CPUS < (256 / __TICKET_LOCK_INC)) -typedef u8 __ticket_t ; -typedef u16 __ticketpair_t ; -#else -typedef u16 __ticket_t ; -typedef u32 __ticketpair_t ; -#endif - -#define TICKET_LOCK_INC ((__ticket_t)__TICKET_LOCK_INC) - -#define TICKET_SHIFT (sizeof(__ticket_t) * 8) -#include <asm-generic/qspinlock_types.h> -#include <asm-generic/qrwlock_types.h> #endif /* _ASM_X86_SPINLOCK_TYPES_H */
Signature · 1 line
2.18.1
[tip: x86/cleanups] x86/spinlock: Remove obsolete ticket spinlock macros and types
The following commit has been merged into the x86/cleanups branch of tip:
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 2ca41f555e857ec5beef6063bfa43a17ee76d7ec Gitweb: https://git.kernel.org/tip/2ca41f555e857ec5beef6063bfa43a17ee76d7ec Author: Waiman Long <[email protected]> AuthorDate: Tue, 26 May 2020 08:20:14 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 28 May 2020 21:18:40 +02:00
x86/spinlock: Remove obsolete ticket spinlock macros and types
Even though the x86 ticket spinlock code has been removed with
cfd8983f03c7 ("x86, locking/spinlocks: Remove ticket (spin)lock implementation")
a while ago, there are still some ticket spinlock specific macros and types left in the asm/spinlock_types.h header file that are no longer used. Remove those as well to avoid confusion.
--- arch/x86/include/asm/spinlock_types.h | 22 ---------------------- 1 file changed, 22 deletions(-)
arch/x86/include/asm/spinlock_types.h +0 -22
@@ -3,29 +3,7 @@#define _ASM_X86_SPINLOCK_TYPES_H#include <linux/types.h> - -#ifdef CONFIG_PARAVIRT_SPINLOCKS -#define __TICKET_LOCK_INC 2 -#define TICKET_SLOWPATH_FLAG ((__ticket_t)1) -#else -#define __TICKET_LOCK_INC 1 -#define TICKET_SLOWPATH_FLAG ((__ticket_t)0) -#endif - -#if (CONFIG_NR_CPUS < (256 / __TICKET_LOCK_INC)) -typedef u8 __ticket_t ; -typedef u16 __ticketpair_t ; -#else -typedef u16 __ticket_t ; -typedef u32 __ticketpair_t ; -#endif - -#define TICKET_LOCK_INC ((__ticket_t)__TICKET_LOCK_INC) - -#define TICKET_SHIFT (sizeof(__ticket_t) * 8) -#include <asm-generic/qspinlock_types.h> -#include <asm-generic/qrwlock_types.h> #endif /* _ASM_X86_SPINLOCK_TYPES_H */