diff options
author | marius <marius@FreeBSD.org> | 2009-03-19 20:46:51 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2009-03-19 20:46:51 +0000 |
commit | d641e4b8bd6b824f39793e72b9efc7b5d5952454 (patch) | |
tree | 8b5b1825e6373bdb61770a707627481b06722ae1 /sys/sun4v | |
parent | 5d64d3c87f1825a642679796d2288fe488d0865f (diff) | |
download | FreeBSD-src-d641e4b8bd6b824f39793e72b9efc7b5d5952454.zip FreeBSD-src-d641e4b8bd6b824f39793e72b9efc7b5d5952454.tar.gz |
- There's no need to wrap kdb_active and kdb_trap() in #ifdef KDB as
they're always available.
- Remove unused variable. [1]
- Add a missing const.
- Sort includes.
Submitted by: Christoph Mallon [1]
Diffstat (limited to 'sys/sun4v')
-rw-r--r-- | sys/sun4v/include/trap.h | 2 | ||||
-rw-r--r-- | sys/sun4v/sun4v/trap.c | 16 |
2 files changed, 4 insertions, 14 deletions
diff --git a/sys/sun4v/include/trap.h b/sys/sun4v/include/trap.h index 42efb8b..8922a35 100644 --- a/sys/sun4v/include/trap.h +++ b/sys/sun4v/include/trap.h @@ -144,7 +144,7 @@ #ifndef LOCORE -extern const char *trap_msg[]; +extern const char *const trap_msg[]; extern void set_mmfsa_traptable(void *, uint64_t); extern void trap_init(void); #endif diff --git a/sys/sun4v/sun4v/trap.c b/sys/sun4v/sun4v/trap.c index bac4f55..ffa0e8c 100644 --- a/sys/sun4v/sun4v/trap.c +++ b/sys/sun4v/sun4v/trap.c @@ -81,7 +81,6 @@ #include <machine/cpu.h> #include <machine/frame.h> #include <machine/intr_machdep.h> -#include <machine/pcb.h> #include <machine/smp.h> #include <machine/trap.h> #include <machine/tstate.h> @@ -119,7 +118,7 @@ extern char fas_nofault_end[]; extern char *syscallnames[]; -const char *trap_msg[] = { +const char *const trap_msg[] = { "reserved", "instruction access exception", "instruction access error", @@ -390,21 +389,17 @@ trap(struct trapframe *tf, int64_t type, uint64_t data) ("trap: kernel trap isn't - trap: %ld:%s: 0x%lx at 0x%lx on cpu=%d\n", trapno, trap_msg[trapno], data, tf->tf_tpc, curcpu)); -#ifdef KDB if (kdb_active) { kdb_reenter(); return; } -#endif switch (trapno) { -#ifdef KDB case T_BREAKPOINT: case T_KSTACK_FAULT: error = (kdb_trap(trapno, 0, tf) == 0); TF_DONE(tf); break; -#endif case T_DATA_MISS: case T_DATA_PROTECTION: case T_INSTRUCTION_MISS: @@ -460,7 +455,6 @@ static int trap_pfault(struct thread *td, struct trapframe *tf, int64_t type, uint64_t data) { struct vmspace *vm; - struct pcb *pcb; struct proc *p; vm_offset_t va; vm_prot_t prot; @@ -475,7 +469,6 @@ trap_pfault(struct thread *td, struct trapframe *tf, int64_t type, uint64_t data rv = KERN_SUCCESS; ctx = TLB_TAR_CTX(data); - pcb = td->td_pcb; type = type & ~T_KERNEL; va = TLB_TAR_VA(data); @@ -603,11 +596,6 @@ syscall(struct trapframe *tf) PCPU_INC(cnt.v_syscall); - narg = 0; - error = 0; - reg = 0; - regcnt = REG_MAXARGS; - td->td_pticks = 0; td->td_frame = tf; if (td->td_ucred != p->p_ucred) @@ -621,6 +609,8 @@ syscall(struct trapframe *tf) tpc = tf->tf_tpc; TF_DONE(tf); + reg = 0; + regcnt = REG_MAXARGS; if (p->p_sysent->sv_prepsyscall) { /* * The prep code is MP aware. |