From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753182AbXDORTQ (ORCPT ); Sun, 15 Apr 2007 13:19:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753188AbXDORTQ (ORCPT ); Sun, 15 Apr 2007 13:19:16 -0400 Received: from ug-out-1314.google.com ([66.249.92.170]:24284 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753182AbXDORTP (ORCPT ); Sun, 15 Apr 2007 13:19:15 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:date:from:to:cc:subject:message-id:mime-version:content-type:content-disposition:user-agent; b=S7IdfOoPK5vyuOd5vQBu6d47icL+nigOeE1CuoJboF+w0rx151XPKAHblkeL2yqExjYqXm0OYLeDk6DGZcb+gRjUh79epJV/d8Mq7gopXY3PcwspqRUTStfCB5BCC59g6jpqBi+OC478wLttwNwDveAa3ysKQGPy2nf9kYXkec8= Date: Sun, 15 Apr 2007 22:51:23 +0530 From: Milind Arun Choudhary To: Kernel Janitors , IA64 Cc: Andrw Morton , LKML , Tony Luck Subject: [KJ][PATCH]SPIN_LOCK_UNLOCKED macro cleanup in arch/ia64 Message-ID: <20070415172123.GA9296@arun.site> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.6i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org SPIN_LOCK_UNLOCKED macro cleanup, use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Milind Arun Choudhary --- kernel/traps.c | 6 +++--- kernel/unwind.c | 2 +- mm/tlb.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index 765cbe5..cd5189f 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c @@ -59,9 +59,9 @@ die (const char *str, struct pt_regs *regs, long err) u32 lock_owner; int lock_owner_depth; } die = { - .lock = SPIN_LOCK_UNLOCKED, - .lock_owner = -1, - .lock_owner_depth = 0 + .lock = __SPIN_LOCK_UNLOCKED(die.lock), + .lock_owner = -1, + .lock_owner_depth = 0 }; static int die_counter; int cpu = get_cpu(); diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c index 93d5a3b..e3be21c 100644 --- a/arch/ia64/kernel/unwind.c +++ b/arch/ia64/kernel/unwind.c @@ -145,7 +145,7 @@ static struct { # endif } unw = { .tables = &unw.kernel_table, - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(unw.lock), .save_order = { UNW_REG_RP, UNW_REG_PFS, UNW_REG_PSP, UNW_REG_PR, UNW_REG_UNAT, UNW_REG_LC, UNW_REG_FPSR, UNW_REG_PRI_UNAT_GR diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index ffad762..fa4e6d4 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c @@ -32,9 +32,9 @@ static struct { } purge; struct ia64_ctx ia64_ctx = { - .lock = SPIN_LOCK_UNLOCKED, - .next = 1, - .max_ctx = ~0U + .lock = __SPIN_LOCK_UNLOCKED(ia64_ctx.lock), + .next = 1, + .max_ctx = ~0U }; DEFINE_PER_CPU(u8, ia64_need_tlb_flush); -- Milind Arun Choudhary