summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-12-06 23:13:20 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-12-06 23:13:20 +0000
commit963b1cd6f5237a8df0819497f54a700820b2b8d2 (patch)
tree62005c08869911cb46138fbde3fece5ccf8da64c /arch/mips
parent1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (diff)
Fix compilation errors, add .cvsignore files.
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/arc/.cvsignore2
-rw-r--r--arch/mips/kernel/entry.S7
-rw-r--r--arch/mips/sgi/kernel/indy_mc.c4
3 files changed, 10 insertions, 3 deletions
diff --git a/arch/mips/arc/.cvsignore b/arch/mips/arc/.cvsignore
new file mode 100644
index 000000000..857dd22e9
--- /dev/null
+++ b/arch/mips/arc/.cvsignore
@@ -0,0 +1,2 @@
+.depend
+.*.flags
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 96925837e..53a5bf0ba 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -7,7 +7,7 @@
*
* Copyright (C) 1994, 1995 by Ralf Baechle
*
- * $Id: entry.S,v 1.16 1999/08/18 23:37:43 ralf Exp $
+ * $Id: entry.S,v 1.17 1999/12/04 03:58:59 ralf Exp $
*/
/*
@@ -40,6 +40,11 @@
.align 4
.set push
.set reorder
+EXPORT(ret_from_fork)
+ jal schedule_tail
+ move a0, v0 # prev
+ j ret_from_sys_call
+ nop
EXPORT(handle_bottom_half)
jal do_bottom_half
b 9f
diff --git a/arch/mips/sgi/kernel/indy_mc.c b/arch/mips/sgi/kernel/indy_mc.c
index 4a16ef6f9..11a7c510f 100644
--- a/arch/mips/sgi/kernel/indy_mc.c
+++ b/arch/mips/sgi/kernel/indy_mc.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
* Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes
*
- * $Id: indy_mc.c,v 1.6 1999/10/21 00:23:05 ralf Exp $
+ * $Id: indy_mc.c,v 1.7 1999/12/04 03:59:00 ralf Exp $
*/
#include <linux/init.h>
#include <linux/kernel.h>
@@ -18,7 +18,7 @@
/* #define DEBUG_SGIMC */
struct sgimc_misc_ctrl *mcmisc_regs;
-unsigned int *rpsscounter;
+u32 *rpsscounter;
struct sgimc_dma_ctrl *dmactrlregs;
static inline char *mconfig_string(unsigned long val)