[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200526122014.25241-1-longman@redhat.com>
Date: Tue, 26 May 2020 08:20:14 -0400
From: Waiman Long <longman@...hat.com>
To: Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>, Will Deacon <will@...nel.org>,
Thomas Gleixner <tglx@...utronix.de>,
"H. Peter Anvin" <hpa@...or.com>, Borislav Petkov <bp@...en8.de>,
x86@...nel.org
Cc: linux-kernel@...r.kernel.org, Waiman Long <longman@...hat.com>
Subject: [PATCH] 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.
Signed-off-by: Waiman Long <longman@...hat.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
Powered by blists - more mailing lists