* [PATCH] x86, spinlock: Remove obsolete ticket spinlock macros and types
@ 2020-05-26 12:20 Waiman Long
2020-05-28 19:28 ` [tip: x86/cleanups] x86/spinlock: " tip-bot2 for Waiman Long
0 siblings, 1 reply; 2+ messages in thread
From: Waiman Long @ 2020-05-26 12:20 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Will Deacon, Thomas Gleixner,
H. Peter Anvin, Borislav Petkov, x86
Cc: linux-kernel, Waiman Long
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.
Signed-off-by: Waiman Long <longman@redhat.com>
---
arch/x86/include/asm/spinlock_types.h | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/arch/x86/include/asm/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h
index bf3e34b25afc..323db6c5852a 100644
--- a/arch/x86/include/asm/spinlock_types.h
+++ b/arch/x86/include/asm/spinlock_types.h
@@ -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 */
--
2.18.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/cleanups] x86/spinlock: Remove obsolete ticket spinlock macros and types
2020-05-26 12:20 [PATCH] x86, spinlock: Remove obsolete ticket spinlock macros and types Waiman Long
@ 2020-05-28 19:28 ` tip-bot2 for Waiman Long
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Waiman Long @ 2020-05-28 19:28 UTC (permalink / raw)
To: linux-tip-commits
Cc: Waiman Long, Borislav Petkov, Thomas Gleixner, Peter Zijlstra, x86, LKML
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 <longman@redhat.com>
AuthorDate: Tue, 26 May 2020 08:20:14 -04:00
Committer: Borislav Petkov <bp@suse.de>
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.
Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200526122014.25241-1-longman@redhat.com
---
arch/x86/include/asm/spinlock_types.h | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/arch/x86/include/asm/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h
index bf3e34b..323db6c 100644
--- a/arch/x86/include/asm/spinlock_types.h
+++ b/arch/x86/include/asm/spinlock_types.h
@@ -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 */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-28 19:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 12:20 [PATCH] x86, spinlock: Remove obsolete ticket spinlock macros and types Waiman Long
2020-05-28 19:28 ` [tip: x86/cleanups] x86/spinlock: " tip-bot2 for Waiman Long
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).