diff --git a/sys/arch/arm/arm/ast.c b/sys/arch/arm/arm/ast.c
index d7e96e6fb983..90865467b5d1 100644
--- a/sys/arch/arm/arm/ast.c
+++ b/sys/arch/arm/arm/ast.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.16 2008/11/19 06:29:48 matt Exp $	*/
+/*	$NetBSD: ast.c,v 1.17 2008/12/19 15:20:10 njoly Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.16 2008/11/19 06:29:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.17 2008/12/19 15:20:10 njoly Exp $");
 
 #include "opt_ddb.h"
 
@@ -123,7 +123,7 @@ ast(struct trapframe *tf)
 
 	if (l->l_pflag & LP_OWEUPC) {
 		l->l_pflag &= ~LP_OWEUPC;
-		ADDUPROF(p);
+		ADDUPROF(l);
 	}
 
 	/* Allow a forced task switch. */
diff --git a/sys/arch/luna68k/luna68k/trap.c b/sys/arch/luna68k/luna68k/trap.c
index 264a467ae2cc..1bfdbae63e27 100644
--- a/sys/arch/luna68k/luna68k/trap.c
+++ b/sys/arch/luna68k/luna68k/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.53 2008/10/15 06:51:18 wrstuden Exp $ */
+/* $NetBSD: trap.c,v 1.54 2008/12/19 15:20:10 njoly Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.53 2008/10/15 06:51:18 wrstuden Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.54 2008/12/19 15:20:10 njoly Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -511,7 +511,7 @@ trap(fp, type, code, v)
 		spl0();
 		if (l->l_pflag & LP_OWEUPC) {
 			l->l_pflag &= ~LP_OWEUPC;
-			ADDUPROF(p);
+			ADDUPROF(l);
 		}
 		if (curcpu()->ci_want_resched)
 			preempt();
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c
index cffed94b9070..e55f9b034ffc 100644
--- a/sys/arch/powerpc/powerpc/trap.c
+++ b/sys/arch/powerpc/powerpc/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.128 2008/10/25 09:10:07 mrg Exp $	*/
+/*	$NetBSD: trap.c,v 1.129 2008/12/19 15:20:10 njoly Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.128 2008/10/25 09:10:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.129 2008/12/19 15:20:10 njoly Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -343,7 +343,7 @@ trap(struct trapframe *frame)
 		uvmexp.softs++;
 		if (l->l_pflag & LP_OWEUPC) {
 			l->l_flag &= ~LP_OWEUPC;
-			ADDUPROF(p);
+			ADDUPROF(l);
 		}
 		/* Check whether we are being preempted. */
 		if (ci->ci_want_resched)
diff --git a/sys/arch/sh3/sh3/exception.c b/sys/arch/sh3/sh3/exception.c
index b3a6de7d2cc3..88d0049e3198 100644
--- a/sys/arch/sh3/sh3/exception.c
+++ b/sys/arch/sh3/sh3/exception.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: exception.c,v 1.52 2008/10/21 04:16:59 wrstuden Exp $	*/
+/*	$NetBSD: exception.c,v 1.53 2008/12/19 15:20:10 njoly Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.52 2008/10/21 04:16:59 wrstuden Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.53 2008/12/19 15:20:10 njoly Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -459,7 +459,7 @@ ast(struct lwp *l, struct trapframe *tf)
 
 		if (l->l_pflag & LP_OWEUPC) {
 			l->l_pflag &= ~LP_OWEUPC;
-			ADDUPROF(p);
+			ADDUPROF(l);
 		}
 
 		if (l->l_cpu->ci_want_resched) {