Reversion of commit by Davidxu plus fixes since applied.

I'm not convinced there is anything major wrong with the patch but
them's the rules..

I am using my "David's mentor" hat to revert this as he's
offline for a while.

1 files changed, 4 insertions, 2 deletions

diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 9dd9cf4..581c1e7 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -62,6 +62,8 @@ struct pstats {
 		u_long	pr_size;	/* buffer size */
 		u_long	pr_off;		/* pc offset */
 		u_long	pr_scale;	/* pc scaling */
+		u_long	pr_addr;	/* temp storage for addr until AST */
+		u_int	pr_ticks;	/* temp storage for ticks until AST */
 	} p_prof;
 #define	pstat_endcopy	p_start
 	struct	timeval p_start;	/* starting time */
@@ -103,8 +105,8 @@ struct thread;
 struct kse;
 struct proc;
 
-void	 addupc_intr(struct thread *td, uintptr_t pc, u_int ticks);
-void	 addupc_task(struct thread *td, uintptr_t pc, u_int ticks);
+void	 addupc_intr(struct kse *ke, uintptr_t pc, u_int ticks);
+void	 addupc_task(struct kse *ke, uintptr_t pc, u_int ticks);
 void	 calcru(struct proc *p, struct timeval *up, struct timeval *sp,
 	    struct timeval *ip);
 int	 chgproccnt(struct uidinfo *uip, int diff, int max);