From patchwork Sat Nov 7 12:16:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 37915 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 5B371B7B76 for ; Sat, 7 Nov 2009 23:17:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751640AbZKGMQr (ORCPT ); Sat, 7 Nov 2009 07:16:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751714AbZKGMQr (ORCPT ); Sat, 7 Nov 2009 07:16:47 -0500 Received: from www.tglx.de ([62.245.132.106]:44473 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751640AbZKGMQr (ORCPT ); Sat, 7 Nov 2009 07:16:47 -0500 Received: from localhost (www.tglx.de [127.0.0.1]) by www.tglx.de (8.13.8/8.13.8/TGLX-2007100201) with ESMTP id nA7CGOKq031608 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 7 Nov 2009 13:16:25 +0100 Date: Sat, 7 Nov 2009 13:16:24 +0100 (CET) From: Thomas Gleixner To: David Miller cc: linux-kernel@vger.kernel.org, mingo@elte.hu, peterz@infradead.org, sparclinux@vger.kernel.org Subject: Re: [patch 14/16] sparc: Replace old style lock initializer In-Reply-To: <20091106.222032.02604670.davem@davemloft.net> Message-ID: References: <20091106223547.784916750@linutronix.de> <20091106223806.973326715@linutronix.de> <20091106.221834.246946954.davem@davemloft.net> <20091106.222032.02604670.davem@davemloft.net> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.95.1 at www.tglx.de X-Virus-Status: Clean X-Spam-Status: No, score=-1.7 required=5.0 tests=ALL_TRUSTED,AWL autolearn=failed version=3.2.4 X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on www.tglx.de Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org On Fri, 6 Nov 2009, David Miller wrote: > From: David Miller > Date: Fri, 06 Nov 2009 22:18:34 -0800 (PST) > > > From: Thomas Gleixner > > Date: Fri, 06 Nov 2009 22:42:14 -0000 > > > >> SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. > >> > >> Signed-off-by: Thomas Gleixner > > > > Applied to sparc-next-2.6, thanks. > > This breaks the build: > > /home/davem/src/GIT/sparc-next-2.6/arch/sparc/include/asm/rwsem.h:39: error: expected identifier or ‘(’ before ‘{’ token > /home/davem/src/GIT/sparc-next-2.6/arch/sparc/include/asm/rwsem.h:39: error: expected identifier or ‘(’ before ‘}’ token > make[1]: *** [arch/sparc/kernel/asm-offsets.s] Error 1 > make: *** [prepare0] Error 2 Darn, I compiled it but the 32bit build does not use that file :) Working version below. Thanks, tglx --- Subject: sparc: Replace old style lock initializer From: Thomas Gleixner Date: Fri, 06 Nov 2009 22:06:35 +0100 SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Thomas Gleixner Cc: David S. Miller Cc: sparclinux@vger.kernel.org --- arch/sparc/include/asm/rwsem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6/arch/sparc/include/asm/rwsem.h =================================================================== --- linux-2.6.orig/arch/sparc/include/asm/rwsem.h +++ linux-2.6/arch/sparc/include/asm/rwsem.h @@ -35,8 +35,8 @@ struct rw_semaphore { #endif #define __RWSEM_INITIALIZER(name) \ -{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) \ - __RWSEM_DEP_MAP_INIT(name) } +{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \ + LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) } #define DECLARE_RWSEM(name) \ struct rw_semaphore name = __RWSEM_INITIALIZER(name)