From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755631Ab0KCPY6 (ORCPT ); Wed, 3 Nov 2010 11:24:58 -0400 Received: from claw.goop.org ([74.207.240.146]:52455 "EHLO claw.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755523Ab0KCPYz (ORCPT ); Wed, 3 Nov 2010 11:24:55 -0400 From: Jeremy Fitzhardinge To: Peter Zijlstra Cc: Linux Kernel Mailing List , Nick Piggin , Jan Beulich , Avi Kivity , Xen-devel , "H. Peter Anvin" , Linux Virtualization , Srivatsa Vaddagiri , Jeremy Fitzhardinge Subject: [PATCH 18/20] x86/ticketlock: remove .slock Date: Wed, 3 Nov 2010 10:59:59 -0400 Message-Id: X-Mailer: git-send-email 1.7.2.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Fitzhardinge Signed-off-by: Jeremy Fitzhardinge --- arch/x86/include/asm/spinlock_types.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h index b396ed5..def8010 100644 --- a/arch/x86/include/asm/spinlock_types.h +++ b/arch/x86/include/asm/spinlock_types.h @@ -20,7 +20,6 @@ typedef u32 __ticketpair_t; typedef struct arch_spinlock { union { - unsigned int slock; __ticketpair_t ticketpair; struct __raw_tickets { __ticket_t head, tail; @@ -31,7 +30,7 @@ typedef struct arch_spinlock { #endif } arch_spinlock_t; -#define __ARCH_SPIN_LOCK_UNLOCKED { { .slock = 0 } } +#define __ARCH_SPIN_LOCK_UNLOCKED { { .tickets = {0, 0} } } typedef struct { unsigned int lock; -- 1.7.2.3