From: Andrew Morton <akpm@osdl.org>
To: leif <leif@gci.net>
Cc: linux-kernel@vger.kernel.org
Subject: Re: error in Sparc64 rwlock.S
Date: Tue, 18 Nov 2003 13:09:56 -0800 [thread overview]
Message-ID: <20031118130956.1edd4a24.akpm@osdl.org> (raw)
In-Reply-To: <00de01c3ae17$1ac8bd70$31828ad0@internet.gci.net>
leif <leif@gci.net> wrote:
>
> I'm going through the 2.6.0-test9 and some -mm3 patches, and have run
> into
> an issue with arch/sparc64/lib/rwlock.S
>
> When compiling, the assembler complains of multiple definitions of
> __write_trylock.
OK, the lockmeter patch adds a write_trylock() implementation to sparc64,
but now Linus's tree has one anyway.
Does this fix it?
diff -puN arch/sparc64/lib/rwlock.S~lockmeter-sparc64-fix arch/sparc64/lib/rwlock.S
--- 25/arch/sparc64/lib/rwlock.S~lockmeter-sparc64-fix Tue Nov 18 13:07:40 2003
+++ 25-akpm/arch/sparc64/lib/rwlock.S Tue Nov 18 13:08:26 2003
@@ -98,20 +98,5 @@ __read_trylock: /* %o0 = lock_ptr */
retl
mov 1, %o0
- .globl __write_trylock
-__write_trylock: /* %o0 = lock_ptr */
- sethi %hi(0x80000000), %g2
-1: lduw [%o0], %g5
-4: brnz,pn %g5, 100f
- or %g5, %g2, %g7
- cas [%o0], %g5, %g7
- cmp %g5, %g7
- bne,pn %icc, 1b
- membar #StoreLoad | #StoreStore
- retl
- mov 1, %o0
-100: retl
- mov 0, %o0
-
rwlock_impl_end:
_
next prev parent reply other threads:[~2003-11-18 21:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-12-11 20:43 Linux 2.4.20-ac2 Alan Cox
2002-12-11 23:30 ` HyperThreading in recent 2.4-ac kernels Gerald Britton
2002-12-12 1:36 ` Alan Cox
2002-12-12 20:12 ` detecting layout in RAID Anu
2002-12-17 22:55 ` Neil Brown
2003-11-18 21:01 ` error in Sparc64 rwlock.S leif
2003-11-18 21:09 ` Andrew Morton [this message]
2003-11-19 0:46 ` David S. Miller
2003-11-19 21:37 ` leif
2003-11-19 22:30 ` Andrew Morton
2003-11-20 0:03 ` leif
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=20031118130956.1edd4a24.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=leif@gci.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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