From: Tsutomu OWA <tsutomu.owa@toshiba•co.jp>
To: mingo@elte•hu
Cc: linuxppc-dev@ozlabs•org, linux-kernel@vger•kernel.org
Subject: [patch 5/7 -rt] powerpc 2.6.20-rt8: fix compile error (spinlock.h)
Date: Wed, 07 Mar 2007 10:19:31 +0900 [thread overview]
Message-ID: <yyid53l26l8.wl@toshiba.co.jp> (raw)
In-Reply-To: <yyik5xt27c0.wl@toshiba.co.jp>
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 <tsutomu.owa@toshiba•co.jp>
-- 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)
next prev parent reply other threads:[~2007-03-07 1:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-07 1:03 [patch 0/7 -rt] powerpc 2.6.20-rt8: fix build breakage for PowerPC(ppc64) Tsutomu OWA
2007-03-07 1:14 ` [patch 1/7 -rt] powerpc 2.6.20-rt8: fix compile error in bug.h Tsutomu OWA
2007-03-07 1:15 ` [patch 2/7] powerpc 2.6.20-rt8: fix compile error (time.c) Tsutomu OWA
2007-03-07 1:16 ` [patch 3/7] powerpc 2.6.20-rt8: fix compile error (manage.c) Tsutomu OWA
2007-03-07 1:18 ` [patch 4/7] powerpc 2.6.20-rt8: fix compile error (futex.h) Tsutomu OWA
2007-03-07 1:19 ` Tsutomu OWA [this message]
2007-03-07 1:20 ` [patch 6/7 -rt] powerpc 2.6.20-rt8: fix compile error (percpu.h) Tsutomu OWA
2007-03-07 1:22 ` [patch 7/7 -rt] powerpc 2.6.20-rt8: fix compile error (hw_irq.h) Tsutomu OWA
2007-03-07 9:05 ` [patch 0/7 -rt] powerpc 2.6.20-rt8: fix build breakage for PowerPC(ppc64) Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=yyid53l26l8.wl@toshiba.co.jp \
--to=tsutomu.owa@toshiba$(echo .)co.jp \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=mingo@elte$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox