summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorHarald Koerfgen <hkoerfg@web.de>1999-12-08 22:05:10 +0000
committerHarald Koerfgen <hkoerfg@web.de>1999-12-08 22:05:10 +0000
commit9d567587f846e75ffa7d342a44802f0cadfc1d6e (patch)
tree1cce52a2ab1e05721dc221b42b6e2a83c2e467ea /arch/mips
parente32d6bd04736ec373410c5cabfe6d232aa15a2cc (diff)
o R3000 fixes
o R4x00 little endiam semaphores
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/entry.S6
-rw-r--r--arch/mips/kernel/r2300_misc.S9
2 files changed, 6 insertions, 9 deletions
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 53a5bf0ba..b6987cf42 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.17 1999/12/04 03:58:59 ralf Exp $
+ * $Id: entry.S,v 1.18 1999/12/06 23:13:20 ralf Exp $
*/
/*
@@ -41,10 +41,10 @@
.set push
.set reorder
EXPORT(ret_from_fork)
- jal schedule_tail
move a0, v0 # prev
+ jal schedule_tail
j ret_from_sys_call
- nop
+
EXPORT(handle_bottom_half)
jal do_bottom_half
b 9f
diff --git a/arch/mips/kernel/r2300_misc.S b/arch/mips/kernel/r2300_misc.S
index 82635c11f..149012a1f 100644
--- a/arch/mips/kernel/r2300_misc.S
+++ b/arch/mips/kernel/r2300_misc.S
@@ -1,4 +1,4 @@
-/* $Id: r2300_misc.S,v 1.6 1999/09/27 11:13:47 raiko Exp $
+/* $Id: r2300_misc.S,v 1.7 1999/10/09 00:00:58 ralf Exp $
* misc.S: Misc. exception handling code for R3000/R2000.
*
* Copyright (C) 1994, 1995, 1996 by Ralf Baechle and Andreas Busse
@@ -39,13 +39,10 @@
*/
#define LOAD_PTE(pte, ptr) \
mfc0 pte, CP0_BADVADDR; \
- _GET_CURRENT(ptr); \
+ lw ptr, current_pgd; \
srl pte, pte, 22; \
- lw ptr, TASK_MM(ptr); \
- nop; \
- lw ptr, MM_PGD(ptr); \
sll pte, pte, 2; \
- addu ptr, pte, ptr; \
+ addu ptr, ptr, pte; \
mfc0 pte, CP0_CONTEXT; \
lw ptr, (ptr); \
andi pte, pte, 0xffc; \