diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
| commit | 99e711101c7822d9ddf39f16c026b97e16a9f517 (patch) | |
| tree | 97f9d3bc19a3595365e68115015e27f1d4e7009d /arch/x86/include/asm/spinlock.h | |
| parent | f1dc154f82595386cddcc7b980d8760474c3dd2d (diff) | |
| parent | 3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f (diff) | |
Merge branch 'linus' into x86/cleanups, before applying dependent patch
Diffstat (limited to 'arch/x86/include/asm/spinlock.h')
| -rw-r--r-- | arch/x86/include/asm/spinlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h index cf87de3fc390..64b611782ef0 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h @@ -169,7 +169,7 @@ static inline int arch_spin_is_contended(arch_spinlock_t *lock) struct __raw_tickets tmp = READ_ONCE(lock->tickets); tmp.head &= ~TICKET_SLOWPATH_FLAG; - return (tmp.tail - tmp.head) > TICKET_LOCK_INC; + return (__ticket_t)(tmp.tail - tmp.head) > TICKET_LOCK_INC; } #define arch_spin_is_contended arch_spin_is_contended |