summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-11-17 22:48:12 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-11-17 22:48:12 +0000
commit97f7daf8ea67841c55c3daa8e55735c04ae2195b (patch)
tree2158c44457e3ac1f824239f1859e0da7b3a1f25c
parenta583cadb82ed787684eddc819cb828a0b44be925 (diff)
Fix a small but highly effective 64-bit bug that also hit MIPS-32.
-rw-r--r--include/asm-mips/system.h4
-rw-r--r--include/asm-mips64/system.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 50c7b0d36..fa0e78feb 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -1,4 +1,4 @@
-/* $Id: system.h,v 1.16 1999/10/09 00:01:43 ralf Exp $
+/* $Id: system.h,v 1.17 1999/10/12 17:33:50 harald Exp $
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
@@ -221,7 +221,7 @@ extern __inline__ unsigned long xchg_u64(volatile long * m, unsigned long val)
"1:\tmove\t$1,%2\n\t"
"scd\t$1,(%1)\n\t"
"beqzl\t$1,1b\n\t"
- "ll\t%0,(%1)\n\t"
+ "lld\t%0,(%1)\n\t"
".set\tat\n\t"
".set\treorder"
: "=r" (val), "=r" (m), "=r" (dummy)
diff --git a/include/asm-mips64/system.h b/include/asm-mips64/system.h
index 54b1a3cfd..76924b7f4 100644
--- a/include/asm-mips64/system.h
+++ b/include/asm-mips64/system.h
@@ -1,4 +1,4 @@
-/* $Id: system.h,v 1.1 1999/08/18 23:37:52 ralf Exp $
+/* $Id: system.h,v 1.2 1999/10/09 00:01:43 ralf Exp $
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
@@ -193,7 +193,7 @@ extern __inline__ unsigned long xchg_u64(volatile long * m, unsigned long val)
"1:\tmove\t$1,%2\n\t"
"scd\t$1,(%1)\n\t"
"beqzl\t$1,1b\n\t"
- "ll\t%0,(%1)\n\t"
+ "lld\t%0,(%1)\n\t"
".set\tat\n\t"
".set\treorder"
: "=r" (val), "=r" (m), "=r" (dummy)