diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /arch/mips/kernel/entry.S | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'arch/mips/kernel/entry.S')
| -rw-r--r-- | arch/mips/kernel/entry.S | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index 00c321a35..c955b964e 100644 --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S @@ -6,6 +6,8 @@ * for more details. * * Copyright (C) 1994, 1995 by Ralf Baechle + * + * $Id: entry.S,v 1.2 1997/08/11 04:21:31 ralf Exp $ */ /* @@ -38,24 +40,17 @@ .set noreorder .set mips3 .align 4 -/* XXX cli/sti ??? */ handle_bottom_half: - mfc0 s3,CP0_STATUS # Enable IRQs - ori t0,s3, 0x1f - xori t0,0x1e - jal do_bottom_half - mtc0 t0,CP0_STATUS - + nop b 9f - mtc0 s3,CP0_STATUS # Restore old IRQ state + nop -reschedule: - jal schedule +reschedule: jal schedule nop EXPORT(ret_from_sys_call) - lw t0,bh_mask + lw t0,bh_mask lw t1,bh_active # unused delay slot and t0,t1 bnez t0,handle_bottom_half |