diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-24 18:44:05 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-30 16:25:42 +0200 |
| commit | de6dee868338291ad1640ec1c211a633dc45b479 (patch) | |
| tree | 8149be44dd67c393dc12d82fe0bef41f1f699cee | |
| parent | linux-3.10.0-1160.el7 (diff) | |
| download | rhel7-kernel-misery-de6dee868338291ad1640ec1c211a633dc45b479.tar.xz rhel7-kernel-misery-de6dee868338291ad1640ec1c211a633dc45b479.zip | |
x86: spinlock_types: use u16 __ticket_t always
While it'd be nice to have the smaller type for low-CPU builds, the
generic spinlock include hardcodes this at u16 for kABI purposes. For
that reason, we just keep the larger types always, in order to avoid a
build-time error.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | arch/x86/include/asm/spinlock_types.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/include/asm/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h index 93560ed86b7..37182786379 100644 --- a/arch/x86/include/asm/spinlock_types.h +++ b/arch/x86/include/asm/spinlock_types.h @@ -11,13 +11,8 @@ #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) |