summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-04-11 05:19:46 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-04-11 05:19:46 +0000
commitc162d2843275a1f55fc9af421c0b4ec7869fd1cb (patch)
tree4d25dd044764a533dc24746d5a01a60469756127
parent7e4280af42e457a8cf17c42beff3eb6ede07c3c0 (diff)
Fix delay slot bug.
-rw-r--r--arch/mips/kernel/r2300_fpu.S1
-rw-r--r--arch/mips/kernel/r4k_fpu.S1
-rw-r--r--arch/mips64/kernel/r4k_fpu.S8
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S
index 5489ea9b8..f83c31f72 100644
--- a/arch/mips/kernel/r2300_fpu.S
+++ b/arch/mips/kernel/r2300_fpu.S
@@ -117,6 +117,7 @@ LEAF(_restore_fp_context)
jr ra
ctc1 t0,fcr31
END(_restore_fp_context)
+ .set reorder
.type fault@function
.ent fault
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S
index 6ad810d04..b1f1fdcc2 100644
--- a/arch/mips/kernel/r4k_fpu.S
+++ b/arch/mips/kernel/r4k_fpu.S
@@ -93,6 +93,7 @@ LEAF(_restore_fp_context)
jr ra
ctc1 t0,fcr31
END(_restore_fp_context)
+ .set reorder
.type fault@function
.ent fault
diff --git a/arch/mips64/kernel/r4k_fpu.S b/arch/mips64/kernel/r4k_fpu.S
index 609b9fd0a..f974bb84e 100644
--- a/arch/mips64/kernel/r4k_fpu.S
+++ b/arch/mips64/kernel/r4k_fpu.S
@@ -1,17 +1,16 @@
-/* $Id: r4k_fpu.S,v 1.1 1999/09/27 16:01:38 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
* for more details.
*
* Save/restore floating point context for signal handlers.
*
- * Copyright (C) 1996, 1998, 1999 by Ralf Baechle
+ * Copyright (C) 1996, 1998, 1999, 2001 by Ralf Baechle
*
* Multi-arch abstraction and asm macros for easier reading:
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
*
- * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1999, 2001 Silicon Graphics, Inc.
*/
#include <asm/asm.h>
#include <asm/errno.h>
@@ -141,6 +140,7 @@ LEAF(restore_fp_context)
jr ra
li v0, 0 # success
END(restore_fp_context)
+ .set reorder
.type fault@function
.ent fault