diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /arch/mips/kernel/entry.S | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'arch/mips/kernel/entry.S')
| -rw-r--r-- | arch/mips/kernel/entry.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index f72efb92d..fb2b6a552 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.10 1998/05/04 09:12:49 ralf Exp $ + * $Id: entry.S,v 1.11 1998/08/25 09:14:38 ralf Exp $ */ /* @@ -100,8 +100,6 @@ LEAF(spurious_interrupt) STI #define __BUILD_clear_cli(exception) \ CLI -#define __BUILD_clear_kmode(exception) \ - KMODE #define __BUILD_clear_fpe(exception) \ cfc1 a1,fcr31; \ li a2,~(0x3f<<12); \ @@ -111,7 +109,7 @@ LEAF(spurious_interrupt) #define __BUILD_clear_ade(exception) \ MFC0 t0,CP0_BADVADDR; \ REG_S t0,PT_BVADDR(sp); \ - STI + KMODE #define __BUILD_silent(exception) #define fmt "Got %s at %08lx.\n" @@ -145,8 +143,8 @@ EXPORT(exception_count_##exception); \ nop; \ END(handle_##exception) - BUILD_HANDLER(adel,ade,kmode,silent) /* #4 */ - BUILD_HANDLER(ades,ade,kmode,silent) /* #5 */ + BUILD_HANDLER(adel,ade,ade,silent) /* #4 */ + BUILD_HANDLER(ades,ade,ade,silent) /* #5 */ BUILD_HANDLER(ibe,ibe,cli,verbose) /* #6 */ BUILD_HANDLER(dbe,dbe,cli,verbose) /* #7 */ BUILD_HANDLER(bp,bp,sti,silent) /* #9 */ |