From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: linux-kernel@vger.kernel.org, torvalds@transmeta.com
Subject: [PATCH] 2.5.40 s390 (10/27): bitops bug.
Date: Fri, 4 Oct 2002 16:28:36 +0200 [thread overview]
Message-ID: <200210041628.36780.schwidefsky@de.ibm.com> (raw)
Fix broken bitops for unaligned atomic operations on s390.
diff -urN linux-2.5.40/include/asm-s390/bitops.h linux-2.5.40-s390/include/asm-s390/bitops.h
--- linux-2.5.40/include/asm-s390/bitops.h Tue Oct 1 09:06:13 2002
+++ linux-2.5.40-s390/include/asm-s390/bitops.h Fri Oct 4 16:15:28 2002
@@ -59,8 +59,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 3; /* align address to 4 */
nr += (addr & 3) << 3; /* add alignment to bit number */
+ addr ^= addr & 3; /* align address to 4 */
#endif
addr += (nr ^ (nr & 31)) >> 3; /* calculate address for CS */
mask = 1UL << (nr & 31); /* make OR mask */
@@ -84,8 +84,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 3; /* align address to 4 */
nr += (addr & 3) << 3; /* add alignment to bit number */
+ addr ^= addr & 3; /* align address to 4 */
#endif
addr += (nr ^ (nr & 31)) >> 3; /* calculate address for CS */
mask = ~(1UL << (nr & 31)); /* make AND mask */
@@ -109,8 +109,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 3; /* align address to 4 */
nr += (addr & 3) << 3; /* add alignment to bit number */
+ addr ^= addr & 3; /* align address to 4 */
#endif
addr += (nr ^ (nr & 31)) >> 3; /* calculate address for CS */
mask = 1UL << (nr & 31); /* make XOR mask */
@@ -160,8 +160,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 3; /* align address to 4 */
nr += (addr & 3) << 3; /* add alignment to bit number */
+ addr ^= addr & 3; /* align address to 4 */
#endif
addr += (nr ^ (nr & 31)) >> 3; /* calculate address for CS */
mask = ~(1UL << (nr & 31)); /* make AND mask */
@@ -186,8 +186,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 3; /* align address to 4 */
nr += (addr & 3) << 3; /* add alignment to bit number */
+ addr ^= addr & 3; /* align address to 4 */
#endif
addr += (nr ^ (nr & 31)) >> 3; /* calculate address for CS */
mask = 1UL << (nr & 31); /* make XOR mask */
diff -urN linux-2.5.40/include/asm-s390x/bitops.h linux-2.5.40-s390/include/asm-s390x/bitops.h
--- linux-2.5.40/include/asm-s390x/bitops.h Fri Oct 4 16:14:46 2002
+++ linux-2.5.40-s390/include/asm-s390x/bitops.h Fri Oct 4 16:15:28 2002
@@ -63,8 +63,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 7; /* align address to 8 */
nr += (addr & 7) << 3; /* add alignment to bit number */
+ addr ^= addr & 7; /* align address to 8 */
#endif
addr += (nr ^ (nr & 63)) >> 3; /* calculate address for CS */
mask = 1UL << (nr & 63); /* make OR mask */
@@ -88,8 +88,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 7; /* align address to 8 */
nr += (addr & 7) << 3; /* add alignment to bit number */
+ addr ^= addr & 7; /* align address to 8 */
#endif
addr += (nr ^ (nr & 63)) >> 3; /* calculate address for CS */
mask = ~(1UL << (nr & 63)); /* make AND mask */
@@ -113,8 +113,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 7; /* align address to 8 */
nr += (addr & 7) << 3; /* add alignment to bit number */
+ addr ^= addr & 7; /* align address to 8 */
#endif
addr += (nr ^ (nr & 63)) >> 3; /* calculate address for CS */
mask = 1UL << (nr & 63); /* make XOR mask */
@@ -139,8 +139,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 7; /* align address to 8 */
nr += (addr & 7) << 3; /* add alignment to bit number */
+ addr ^= addr & 7; /* align address to 8 */
#endif
addr += (nr ^ (nr & 63)) >> 3; /* calculate address for CS */
mask = 1UL << (nr & 63); /* make OR/test mask */
@@ -166,8 +166,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 7; /* align address to 8 */
nr += (addr & 7) << 3; /* add alignment to bit number */
+ addr ^= addr & 7; /* align address to 8 */
#endif
addr += (nr ^ (nr & 63)) >> 3; /* calculate address for CS */
mask = ~(1UL << (nr & 63)); /* make AND mask */
@@ -193,8 +193,8 @@
addr = (unsigned long) ptr;
#if ALIGN_CS == 1
- addr ^= addr & 7; /* align address to 8 */
nr += (addr & 7) << 3; /* add alignment to bit number */
+ addr ^= addr & 7; /* align address to 8 */
#endif
addr += (nr ^ (nr & 63)) >> 3; /* calculate address for CS */
mask = 1UL << (nr & 63); /* make XOR mask */
reply other threads:[~2002-10-04 14:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200210041628.36780.schwidefsky@de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/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
all inboxes | Powered by JetHome®