Skip to content

Commit 2ca41f5

Browse files
Waiman-Longsuryasaimadhu
authored andcommitted
x86/spinlock: Remove obsolete ticket spinlock macros and types
Even though the x86 ticket spinlock code has been removed with cfd8983 ("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 <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Acked-by: Peter Zijlstra <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 4317326 commit 2ca41f5

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

arch/x86/include/asm/spinlock_types.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,7 @@
33
#define _ASM_X86_SPINLOCK_TYPES_H
44

55
#include <linux/types.h>
6-
7-
#ifdef CONFIG_PARAVIRT_SPINLOCKS
8-
#define __TICKET_LOCK_INC 2
9-
#define TICKET_SLOWPATH_FLAG ((__ticket_t)1)
10-
#else
11-
#define __TICKET_LOCK_INC 1
12-
#define TICKET_SLOWPATH_FLAG ((__ticket_t)0)
13-
#endif
14-
15-
#if (CONFIG_NR_CPUS < (256 / __TICKET_LOCK_INC))
16-
typedef u8 __ticket_t;
17-
typedef u16 __ticketpair_t;
18-
#else
19-
typedef u16 __ticket_t;
20-
typedef u32 __ticketpair_t;
21-
#endif
22-
23-
#define TICKET_LOCK_INC ((__ticket_t)__TICKET_LOCK_INC)
24-
25-
#define TICKET_SHIFT (sizeof(__ticket_t) * 8)
26-
276
#include <asm-generic/qspinlock_types.h>
28-
297
#include <asm-generic/qrwlock_types.h>
308

319
#endif /* _ASM_X86_SPINLOCK_TYPES_H */

0 commit comments

Comments
 (0)