diff options
Diffstat (limited to 'include/asm-sparc64/ttable.h')
| -rw-r--r-- | include/asm-sparc64/ttable.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h index 2784f80094c3..f557db4faf84 100644 --- a/include/asm-sparc64/ttable.h +++ b/include/asm-sparc64/ttable.h | |||
| @@ -109,14 +109,14 @@ | |||
| 109 | nop;nop;nop; | 109 | nop;nop;nop; |
| 110 | 110 | ||
| 111 | #define TRAP_UTRAP(handler,lvl) \ | 111 | #define TRAP_UTRAP(handler,lvl) \ |
| 112 | ldx [%g6 + TI_UTRAPS], %g1; \ | 112 | mov handler, %g3; \ |
| 113 | sethi %hi(109f), %g7; \ | 113 | ba,pt %xcc, utrap_trap; \ |
| 114 | brz,pn %g1, utrap; \ | 114 | mov lvl, %g4; \ |
| 115 | or %g7, %lo(109f), %g7; \ | 115 | nop; \ |
| 116 | ba,pt %xcc, utrap; \ | 116 | nop; \ |
| 117 | 109: ldx [%g1 + handler*8], %g1; \ | 117 | nop; \ |
| 118 | ba,pt %xcc, utrap_ill; \ | 118 | nop; \ |
| 119 | mov lvl, %o1; | 119 | nop; |
| 120 | 120 | ||
| 121 | #ifdef CONFIG_SUNOS_EMUL | 121 | #ifdef CONFIG_SUNOS_EMUL |
| 122 | #define SUNOS_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall32, sunos_sys_table) | 122 | #define SUNOS_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall32, sunos_sys_table) |
| @@ -136,8 +136,6 @@ | |||
| 136 | #else | 136 | #else |
| 137 | #define SOLARIS_SYSCALL_TRAP TRAP(solaris_syscall) | 137 | #define SOLARIS_SYSCALL_TRAP TRAP(solaris_syscall) |
| 138 | #endif | 138 | #endif |
| 139 | /* FIXME: Write these actually */ | ||
| 140 | #define NETBSD_SYSCALL_TRAP TRAP(netbsd_syscall) | ||
| 141 | #define BREAKPOINT_TRAP TRAP(breakpoint_trap) | 139 | #define BREAKPOINT_TRAP TRAP(breakpoint_trap) |
| 142 | 140 | ||
| 143 | #define TRAP_IRQ(routine, level) \ | 141 | #define TRAP_IRQ(routine, level) \ |