Remove some leftovers from the userret cleanups.

No need to save sticks anymore.
miod@ ok and test

5 files changed, 6 insertions, 25 deletions

diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c
index a408e050cbf..7c5f8cb7334 100644
--- a/sys/arch/hp300/hp300/trap.c
+++ b/sys/arch/hp300/hp300/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.50 2007/03/15 10:22:29 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.51 2007/04/01 09:29:27 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $	*/
 
 /*
@@ -259,7 +259,6 @@ trap(type, code, v, frame)
 	struct proc *p;
 	int i, s;
 	u_int ucode;
-	u_quad_t sticks;
 	int typ = 0;
 	union sigval sv;
 
@@ -277,7 +276,6 @@ trap(type, code, v, frame)
 
 	if (USERMODE(frame.f_sr)) {
 		type |= T_USER;
-		sticks = p->p_sticks;
 		p->p_md.md_regs = frame.f_regs;
 	}
 	switch (type) {
@@ -1024,13 +1022,11 @@ syscall(code, frame)
 	int error, opc, nsys;
 	size_t argsize;
 	register_t args[8], rval[2];
-	u_quad_t sticks;
 
 	uvmexp.syscalls++;
 	if (!USERMODE(frame.f_sr))
 		panic("syscall");
 	p = curproc;
-	sticks = p->p_sticks;
 	p->p_md.md_regs = frame.f_regs;
 	opc = frame.f_pc;
 
diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c
index bc706b11f63..434bbeb65aa 100644
--- a/sys/arch/mac68k/mac68k/trap.c
+++ b/sys/arch/mac68k/mac68k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.52 2007/03/15 10:22:29 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.53 2007/04/01 09:29:27 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $	*/
 
 /*
@@ -219,7 +219,6 @@ trap(type, code, v, frame)
 	int i, s;
 	u_int ucode;
 	int typ = 0;
-	u_quad_t sticks;
 	union sigval sv;
 
 	uvmexp.traps++;
@@ -237,10 +236,8 @@ trap(type, code, v, frame)
 
 	if (USERMODE(frame.f_sr)) {
 		type |= T_USER;
-		sticks = p->p_sticks;
 		p->p_md.md_regs = frame.f_regs;
-	} else
-		sticks = 0;
+	}
 
 	switch (type) {
 	default:
@@ -964,13 +961,11 @@ syscall(code, frame)
 	int error, opc, nsys;
 	size_t argsize;
 	register_t args[8], rval[2];
-	u_quad_t sticks;
 
 	uvmexp.syscalls++;
 	if (!USERMODE(frame.f_sr))
 		panic("syscall");
 	p = curproc;
-	sticks = p->p_sticks;
 	p->p_md.md_regs = frame.f_regs;
 	opc = frame.f_pc;
 
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c
index 41fbfcc4b7c..7a5bed1e38c 100644
--- a/sys/arch/mvme68k/mvme68k/trap.c
+++ b/sys/arch/mvme68k/mvme68k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.65 2007/03/15 10:22:29 art Exp $ */
+/*	$OpenBSD: trap.c,v 1.66 2007/04/01 09:29:27 art Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -238,7 +238,6 @@ trap(type, code, v, frame)
 	register struct proc *p;
 	register int i;
 	u_int ucode;
-	u_quad_t sticks;
 	int typ = 0, bit;
 #ifdef COMPAT_HPUX
 	extern struct emul emul_hpux;
@@ -253,7 +252,6 @@ trap(type, code, v, frame)
 	ucode = 0;
 	if (USERMODE(frame.f_sr)) {
 		type |= T_USER;
-		sticks = p->p_sticks;
 		p->p_md.md_regs = frame.f_regs;
 	}
 	switch (type) {
@@ -957,7 +955,6 @@ syscall(code, frame)
 	int error, opc, nsys;
 	size_t argsize;
 	register_t args[8], rval[2];
-	u_quad_t sticks;
 #ifdef COMPAT_SUNOS
 	extern struct emul emul_sunos;
 #endif
@@ -966,7 +963,6 @@ syscall(code, frame)
 	if (!USERMODE(frame.f_sr))
 		panic("syscall");
 	p = curproc;
-	sticks = p->p_sticks;
 	p->p_md.md_regs = frame.f_regs;
 	opc = frame.f_pc;
 
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c
index f94168607d7..4758a5b4017 100644
--- a/sys/arch/powerpc/powerpc/trap.c
+++ b/sys/arch/powerpc/powerpc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.76 2007/03/23 21:06:06 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.77 2007/04/01 09:29:27 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $	*/
 
 /*
@@ -255,14 +255,12 @@ trap(struct trapframe *frame)
 	struct cpu_info *ci = curcpu();
 	struct proc *p = curproc;
 	int type = frame->exc;
-	u_quad_t sticks;
 	union sigval sv;
 	char *name;
 	db_expr_t offset;
 
 	if (frame->srr1 & PSL_PR) {
 		type |= EXC_USER;
-		sticks = p->p_sticks;
 	}
 
 	switch (type) {
diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c
index c32a9f7a8d3..1bf96264d12 100644
--- a/sys/arch/vax/vax/trap.c
+++ b/sys/arch/vax/vax/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.37 2007/03/15 10:22:30 art Exp $     */
+/*	$OpenBSD: trap.c,v 1.38 2007/04/01 09:29:27 art Exp $     */
 /*	$NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $     */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -126,7 +126,6 @@ arithflt(frame)
 	u_int	sig = 0, type = frame->trap, trapsig = 1;
 	u_int	rv, addr, umode;
 	struct	proc *p = curproc;
-	u_quad_t oticks = 0;
 	struct vm_map *map;
 	vm_prot_t ftype;
 	int typ;
@@ -136,7 +135,6 @@ arithflt(frame)
 	uvmexp.traps++;
 	if ((umode = USERMODE(frame))) {
 		type |= T_USER;
-		oticks = p->p_sticks;
 		p->p_addr->u_pcb.framep = frame; 
 	}
 
@@ -359,7 +357,6 @@ syscall(frame)
 	struct	trapframe *frame;
 {
 	struct sysent *callp;
-	u_quad_t oticks;
 	int nsys;
 	int err, rval[2], args[8];
 	struct trapframe *exptr;
@@ -375,7 +372,6 @@ if(startsysc)printf("trap syscall %s pc %lx, psl %lx, sp %lx, pid %d, frame %p\n
 	exptr = p->p_addr->u_pcb.framep = frame;
 	callp = p->p_emul->e_sysent;
 	nsys = p->p_emul->e_nsysent;
-	oticks = p->p_sticks;
 
 	if(frame->code == SYS___syscall){
 		int g = *(int *)(frame->ap);