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/traps.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/traps.h')
| -rw-r--r-- | include/asm-sparc/traps.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/include/asm-sparc/traps.h b/include/asm-sparc/traps.h index 3a3940df2..6690ab956 100644 --- a/include/asm-sparc/traps.h +++ b/include/asm-sparc/traps.h @@ -1,4 +1,4 @@ -/* $Id: traps.h,v 1.8 1996/05/17 10:38:53 davem Exp $ +/* $Id: traps.h,v 1.9 1998/03/09 14:04:53 jj Exp $ * traps.h: Format of entries for the Sparc trap table. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -11,7 +11,7 @@ #ifndef __ASSEMBLY__ -/* This is for V8 and V9 compliant Sparc CPUS */ +/* This is for V8 compliant Sparc CPUS */ struct tt_entry { unsigned long inst_one; unsigned long inst_two; @@ -22,25 +22,6 @@ struct tt_entry { /* We set this to _start in system setup. */ extern struct tt_entry *sparc_ttable; -/* This for V9 compliant Sparc CPUS */ -struct tt_v9_entry { - unsigned long inst_one; - unsigned long inst_two; - unsigned long inst_three; - unsigned long inst_four; - unsigned long inst_five; - unsigned long inst_six; - unsigned long inst_seven; - unsigned long inst_eight; -}; - -/* V9 has multiple trap tables, which one is used depends - * upon how deep within multiple traps you are. - * I believe the UltraSparc supports two levels now. - */ -extern struct tt_v9_entry *sparc_v9_ttablel0; -extern struct tt_v9_entry *sparc_v9_ttablel1; - extern __inline__ unsigned long get_tbr(void) { unsigned long tbr; |