From: Jeremy Fitzhardinge Subject: Re: [PATCH 04/20] x86/ticketlock: make large and small ticket versions of spin_lock the same Date: Fri, 12 Nov 2010 08:27:04 -0800 Message-ID: <4CDD6AD8.5030003@goop.org> References: <5b3cbff3a6e96a085651f140a0525be80a4df8ba.1288794124.git.jeremy.fitzhardinge@citrix.com> <20101112121932.GA30016@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20101112121932.GA30016@linux.vnet.ibm.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: vatsa@linux.vnet.ibm.com Cc: Nick Piggin , Xen-devel , Peter Zijlstra , Linux Kernel Mailing List , Jan Beulich , Linux Virtualization , Jeremy Fitzhardinge , Avi Kivity , "H. Peter Anvin" List-Id: xen-devel@lists.xenproject.org On 11/12/2010 04:19 AM, Srivatsa Vaddagiri wrote: > On Wed, Nov 03, 2010 at 10:59:45AM -0400, Jeremy Fitzhardinge wrote: >> Make the bulk of __ticket_spin_lock look identical for large and small >> number of cpus. > [snip] > >> #if (NR_CPUS < 256) >> static __always_inline void __ticket_spin_lock(arch_spinlock_t *lock) >> { >> - register union { >> - struct __raw_tickets tickets; >> - unsigned short slock; >> - } inc = { .slock = 1 << TICKET_SHIFT }; >> + register struct __raw_tickets inc = { .tail = 1 }; > [snip] > >> #else >> static __always_inline void __ticket_spin_lock(arch_spinlock_t *lock) >> { >> - unsigned inc = 1 << TICKET_SHIFT; >> - __ticket_t tmp; >> + register struct __raw_tickets inc = { .tickets.tail = 1 }; > s/.tickets//? > > Otherwise I get a compile error for NR_CPUS > 256, with just 4 patches applied. Yeah, likely. That's precisely why I wanted to make them the same ;). J