diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /include/asm-sparc/head.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'include/asm-sparc/head.h')
| -rw-r--r-- | include/asm-sparc/head.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-sparc/head.h b/include/asm-sparc/head.h index 7693be507..94e6b8333 100644 --- a/include/asm-sparc/head.h +++ b/include/asm-sparc/head.h @@ -1,4 +1,4 @@ -/* $Id: head.h,v 1.33 1997/10/04 08:54:22 ecd Exp $ */ +/* $Id: head.h,v 1.35 1998/03/18 09:15:40 jj Exp $ */ #ifndef __SPARC_HEAD_H #define __SPARC_HEAD_H @@ -10,8 +10,7 @@ #define NCPUS 4 /* Architectural limit of sun4m. */ -#define SUN4_PROM_VECTOR 0xFFE81000 /* To safely die on a SUN4 */ -#define SUN4_PRINTF 0x84 /* Offset into SUN4_PROM_VECTOR */ +#define SUN4_PROM_VECTOR 0xFFE81000 /* SUN4 PROM needs to be hardwired */ #define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */ #define NOP_INSN 0x01000000 /* Used to patch sparc_save_state */ @@ -32,6 +31,10 @@ #define BAD_TRAP(num) \ rd %psr, %l0; mov num, %l7; b bad_trap_handler; rd %wim, %l3; +/* This is for traps when we want just skip the instruction which caused it */ +#define SKIP_TRAP(type, name) \ + jmpl %l2, %g0; rett %l2 + 4; nop; nop; + /* Notice that for the system calls we pull a trick. We load up a * different pointer to the system call vector table in %l7, but call * the same generic system call low-level entry point. The trap table |