2ff810a7ef
As the x86 architecture now uses qrwlock for its read/write lock implementation, it is no longer necessary to keep the old rwlock code around. This patch removes the old rwlock code in the asm/spinlock.h and asm/spinlock_types.h files. Now the ARCH_USE_QUEUE_RWLOCK config parameter cannot be removed from x86/Kconfig or there will be a compilation error. Signed-off-by: Waiman Long <Waiman.Long@hp.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Scott J Norton <scott.norton@hp.com> Cc: Dave Jones <davej@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Waiman Long <Waiman.Long@hp.com> Link: http://lkml.kernel.org/r/1408037251-45918-2-git-send-email-Waiman.Long@hp.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
40 lines
839 B
C
40 lines
839 B
C
#ifndef _ASM_X86_SPINLOCK_TYPES_H
|
|
#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)
|
|
|
|
typedef struct arch_spinlock {
|
|
union {
|
|
__ticketpair_t head_tail;
|
|
struct __raw_tickets {
|
|
__ticket_t head, tail;
|
|
} tickets;
|
|
};
|
|
} arch_spinlock_t;
|
|
|
|
#define __ARCH_SPIN_LOCK_UNLOCKED { { 0 } }
|
|
|
|
#include <asm-generic/qrwlock_types.h>
|
|
|
|
#endif /* _ASM_X86_SPINLOCK_TYPES_H */
|