diff options
Diffstat (limited to 'sys/arch/mvme68k/mvme68k/trap.c')
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/trap.c | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c index bd7b1d664e7..2463a805a8e 100644 --- a/sys/arch/mvme68k/mvme68k/trap.c +++ b/sys/arch/mvme68k/mvme68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.31 2001/06/26 21:35:43 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.32 2001/06/27 04:19:17 art Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -98,9 +98,7 @@ extern struct emul emul_sunos; #include <vm/vm.h> #include <vm/pmap.h> -#if defined(UVM) #include <uvm/uvm_extern.h> -#endif #ifdef COMPAT_HPUX #include <compat/hpux/hpux.h> @@ -281,11 +279,7 @@ trap(type, code, v, frame) #endif register union sigval sv; -#if defined(UVM) uvmexp.traps++; -#else - cnt.v_trap++; -#endif p = curproc; ucode = 0; if (USERMODE(frame.f_sr)) { @@ -524,11 +518,7 @@ copyfault: while (bit = ffs(ssir)) { --bit; ssir &= ~(1 << bit); -#if defined(UVM) uvmexp.softs++; -#else - cnt.v_soft++; -#endif if (sir_routines[bit]) sir_routines[bit](sir_args[bit]); } @@ -536,11 +526,7 @@ copyfault: * If this was not an AST trap, we are all done. */ if (type != (T_ASTFLT|T_USER)) { -#if defined(UVM) uvmexp.traps--; -#else - cnt.v_trap--; -#endif return; } spl0(); @@ -609,30 +595,17 @@ copyfault: rv = pmap_mapmulti(map->pmap, va); if (rv != KERN_SUCCESS) { bva = HPMMBASEADDR(va); -#if defined(UVM) rv = uvm_fault(map, bva, 0, ftype); -#else - rv = vm_fault(map, bva, ftype, FALSE); -#endif if (rv == KERN_SUCCESS) (void) pmap_mapmulti(map->pmap, va); } } else #endif -#if defined(UVM) rv = uvm_fault(map, va, 0, ftype); -#else - rv = vm_fault(map, va, ftype, FALSE); -#endif #ifdef DEBUG if (rv && MDB_ISPID(p->p_pid)) -#if defined(UVM) printf("uvm_fault(%x, %x, 0, %x) -> %x\n", map, va, ftype, rv); -#else - printf("vm_fault(%x, %x, %x, 0) -> %x\n", - map, va, ftype, rv); -#endif #endif /* * If this was a stack access we keep track of the maximum @@ -664,13 +637,8 @@ copyfault: if (type == T_MMUFLT) { if (p && p->p_addr->u_pcb.pcb_onfault) goto copyfault; -#if defined(UVM) printf("uvm_fault(%x, %x, 0, %x) -> %x\n", map, va, ftype, rv); -#else - printf("vm_fault(%x, %x, %x, 0) -> %x\n", - map, va, ftype, rv); -#endif printf(" type %x, code [mmu,,ssw]: %x\n", type, code); goto dopanic; @@ -1012,11 +980,7 @@ syscall(code, frame) #ifdef COMPAT_SUNOS extern struct emul emul_sunos; #endif -#if defined(UVM) uvmexp.syscalls++; -#else - cnt.v_syscall++; -#endif if (!USERMODE(frame.f_sr)) panic("syscall"); @@ -1213,11 +1177,7 @@ hardintr(pc, evec, frame) int count = 0; int r; -#if defined(UVM) uvmexp.intrs++; -#else - cnt.v_intr++; -#endif /* intrcnt[level]++; */ for (ih = intrs[vec]; ih; ih = ih->ih_next) { #if 0 |