From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161113AbXCGBTm (ORCPT ); Tue, 6 Mar 2007 20:19:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161107AbXCGBTm (ORCPT ); Tue, 6 Mar 2007 20:19:42 -0500 Received: from imx12.toshiba.co.jp ([61.202.160.132]:39360 "EHLO imx12.toshiba.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161106AbXCGBTl (ORCPT ); Tue, 6 Mar 2007 20:19:41 -0500 Date: Wed, 07 Mar 2007 10:19:31 +0900 Message-ID: From: Tsutomu OWA To: mingo@elte.hu Cc: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org, tsutomu.owa@toshiba.co.jp Subject: [patch 5/7 -rt] powerpc 2.6.20-rt8: fix compile error (spinlock.h) In-Reply-To: References: User-Agent: Wanderlust/2.8.1 (Something) Emacs/20.7 Mule/4.0 (HANANOEN) Organization: Software Engineering Center, TOSHIBA. MIME-Version: 1.0 (generated by SEMI 1.14.4 - "Hosorogi") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org To fix the following compile error by changing names from __{read,write}_trylock to ___raw_{read,write}_trylock in asm-powerpc/spinlock.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - include/asm-powerpc/spinlock.h include/linux/spinlock_api_smp.h:49: error: conflicting types for '__read_trylock' include/asm/spinlock.h:183: error: previous definition of '__read_trylock' was here include/linux/spinlock_api_smp.h:50: error: conflicting types for '__write_trylock' include/asm/spinlock.h:207: error: previous definition of '__write_trylock' was here - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Signed-off-by: Tsutomu Owa -- owa diff -rup linux-rt8/include/asm-powerpc/spinlock.h rt/include/asm-powerpc/spinlock.h --- linux-rt8/include/asm-powerpc/spinlock.h 2007-02-20 14:30:40.000000000 +0900 +++ rt/include/asm-powerpc/spinlock.h 2007-02-20 16:05:27.000000000 +0900 @@ -179,7 +179,7 @@ extern void __raw_spin_unlock_wait(__raw * This returns the old value in the lock + 1, * so we got a read lock if the return value is > 0. */ -static long __inline__ __read_trylock(__raw_rwlock_t *rw) +static long __inline__ ___raw_read_trylock(__raw_rwlock_t *rw) { long tmp; @@ -203,7 +203,7 @@ static long __inline__ __read_trylock(__ * This returns the old value in the lock, * so we got the write lock if the return value is 0. */ -static __inline__ long __write_trylock(__raw_rwlock_t *rw) +static __inline__ long ___raw_write_trylock(__raw_rwlock_t *rw) { long tmp, token; @@ -226,7 +226,7 @@ static __inline__ long __write_trylock(_ static void __inline__ __raw_read_lock(__raw_rwlock_t *rw) { while (1) { - if (likely(__read_trylock(rw) > 0)) + if (likely(___raw_read_trylock(rw) > 0)) break; do { HMT_low(); @@ -240,7 +240,7 @@ static void __inline__ __raw_read_lock(_ static void __inline__ __raw_write_lock(__raw_rwlock_t *rw) { while (1) { - if (likely(__write_trylock(rw) == 0)) + if (likely(___raw_write_trylock(rw) == 0)) break; do { HMT_low(); @@ -253,12 +253,12 @@ static void __inline__ __raw_write_lock( static int __inline__ __raw_read_trylock(__raw_rwlock_t *rw) { - return __read_trylock(rw) > 0; + return ___raw_read_trylock(rw) > 0; } static int __inline__ __raw_write_trylock(__raw_rwlock_t *rw) { - return __write_trylock(rw) == 0; + return ___raw_write_trylock(rw) == 0; } static void __inline__ __raw_read_unlock(__raw_rwlock_t *rw)