aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-08-13 11:53:35 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-09-09 12:06:24 -0400
commit6055aaf87dc835ffdb238f6098110d36b40e3ad3 (patch)
tree3e232a3660fbea1327d61098fe911c894d858bef
parent1fb3a8b2cfb278f139d9ff7ca5fe06a65de64494 (diff)
xen/spinlock: We don't need the old structure anymore
As we are using the generic ticketlock structs and these old structures are not needed anymore. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: David Vrabel <david.vrabel@citrix.com>
-rw-r--r--arch/x86/xen/spinlock.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 0438b9324a72..71db82ce08c6 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -81,7 +81,6 @@ static inline void spin_time_accum_blocked(u64 start)
81 spinlock_stats.time_blocked += delta; 81 spinlock_stats.time_blocked += delta;
82} 82}
83#else /* !CONFIG_XEN_DEBUG_FS */ 83#else /* !CONFIG_XEN_DEBUG_FS */
84#define TIMEOUT (1 << 10)
85static inline void add_stats(enum xen_contention_stat var, u32 val) 84static inline void add_stats(enum xen_contention_stat var, u32 val)
86{ 85{
87} 86}
@@ -96,23 +95,6 @@ static inline void spin_time_accum_blocked(u64 start)
96} 95}
97#endif /* CONFIG_XEN_DEBUG_FS */ 96#endif /* CONFIG_XEN_DEBUG_FS */
98 97
99/*
100 * Size struct xen_spinlock so it's the same as arch_spinlock_t.
101 */
102#if NR_CPUS < 256
103typedef u8 xen_spinners_t;
104# define inc_spinners(xl) \
105 asm(LOCK_PREFIX " incb %0" : "+m" ((xl)->spinners) : : "memory");
106# define dec_spinners(xl) \
107 asm(LOCK_PREFIX " decb %0" : "+m" ((xl)->spinners) : : "memory");
108#else
109typedef u16 xen_spinners_t;
110# define inc_spinners(xl) \
111 asm(LOCK_PREFIX " incw %0" : "+m" ((xl)->spinners) : : "memory");
112# define dec_spinners(xl) \
113 asm(LOCK_PREFIX " decw %0" : "+m" ((xl)->spinners) : : "memory");
114#endif
115
116struct xen_lock_waiting { 98struct xen_lock_waiting {
117 struct arch_spinlock *lock; 99 struct arch_spinlock *lock;
118 __ticket_t want; 100 __ticket_t want;