diff --git a/sys/arch/alpha/alpha/locore.s b/sys/arch/alpha/alpha/locore.s
index 913249655fc2..63928e127970 100644
--- a/sys/arch/alpha/alpha/locore.s
+++ b/sys/arch/alpha/alpha/locore.s
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.118 2009/12/10 05:10:00 rmind Exp $ */
+/* $NetBSD: locore.s,v 1.119 2010/02/25 07:14:48 skrll Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <machine/asm.h>
 
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.118 2009/12/10 05:10:00 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.119 2010/02/25 07:14:48 skrll Exp $");
 
 #include "assym.h"
 
@@ -730,7 +730,7 @@ LEAF(cpu_switchto, 0)
 /*
  * lwp_trampoline()
  *
- * Arrange for a function to be invoked neatly, after a cpu_fork().
+ * Arrange for a function to be invoked neatly, after a cpu_lwp_fork().
  *
  * Invokes the function specified by the s0 register with the return
  * address specified by the s1 register and with one argument specified
diff --git a/sys/arch/alpha/alpha/syscall.c b/sys/arch/alpha/alpha/syscall.c
index 5d2d39fd4718..3504f2cf221d 100644
--- a/sys/arch/alpha/alpha/syscall.c
+++ b/sys/arch/alpha/alpha/syscall.c
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.35 2009/11/21 05:35:41 rmind Exp $ */
+/* $NetBSD: syscall.c,v 1.36 2010/02/25 07:14:48 skrll Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.35 2009/11/21 05:35:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.36 2010/02/25 07:14:48 skrll Exp $");
 
 #include "opt_sa.h"
 
@@ -338,7 +338,7 @@ child_return(void *arg)
 	struct lwp *l = arg;
 
 	/*
-	 * Return values in the frame set by cpu_fork().
+	 * Return values in the frame set by cpu_lwp_fork().
 	 */
 
 	userret(l);
diff --git a/sys/arch/cesfic/cesfic/locore.s b/sys/arch/cesfic/cesfic/locore.s
index 8638f686a18e..ffdd1e1e29b4 100644
--- a/sys/arch/cesfic/cesfic/locore.s
+++ b/sys/arch/cesfic/cesfic/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.21 2009/12/13 11:24:02 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.22 2010/02/25 07:15:25 skrll Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -359,7 +359,7 @@ Lnocache0:
 	jbsr	_C_LABEL(fic_init)
 
 /*
- * Create a fake exception frame so that cpu_fork() can copy it.
+ * Create a fake exception frame so that cpu_lwp_fork() can copy it.
  * main() nevers returns; we exit to user mode from a forked process
  * later on.
  */
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s
index fc5267048cdf..07f59010f455 100644
--- a/sys/arch/hp300/hp300/locore.s
+++ b/sys/arch/hp300/hp300/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.152 2009/12/13 12:21:26 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.153 2010/02/25 07:17:49 skrll Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -587,7 +587,7 @@ Lnocache0:
 	jbsr	_C_LABEL(hp300_init)
 
 /*
- * Create a fake exception frame so that cpu_fork() can copy it.
+ * Create a fake exception frame so that cpu_lwp_fork() can copy it.
  * main() nevers returns; we exit to user mode from a forked process
  * later on.
  */
diff --git a/sys/arch/luna68k/luna68k/locore.s b/sys/arch/luna68k/luna68k/locore.s
index a436ac3a5e7c..e64c48916bb0 100644
--- a/sys/arch/luna68k/luna68k/locore.s
+++ b/sys/arch/luna68k/luna68k/locore.s
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.33 2009/12/13 11:24:02 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.34 2010/02/25 07:17:48 skrll Exp $ */
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -340,7 +340,7 @@ Lenab3:
 
 /*
  * Create a fake exception frame that returns to user mode,
- * and save its address in p->p_md.md_regs for cpu_fork().
+ * and save its address in p->p_md.md_regs for cpu_lwp_fork().
  * The new frames for process 1 and 2 will be adjusted by
  * cpu_set_kpc() to arrange for a call to a kernel function
  * before the new process does its rte out to user mode.
diff --git a/sys/arch/m68k/m68k/m68k_syscall.c b/sys/arch/m68k/m68k/m68k_syscall.c
index 7759459a97a2..7c2857ad00ae 100644
--- a/sys/arch/m68k/m68k/m68k_syscall.c
+++ b/sys/arch/m68k/m68k/m68k_syscall.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: m68k_syscall.c,v 1.38 2009/11/23 00:11:44 rmind Exp $	*/
+/*	$NetBSD: m68k_syscall.c,v 1.39 2010/02/25 07:17:48 skrll Exp $	*/
 
 /*-
  * Portions Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m68k_syscall.c,v 1.38 2009/11/23 00:11:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m68k_syscall.c,v 1.39 2010/02/25 07:17:48 skrll Exp $");
 
 #include "opt_execfmt.h"
 #include "opt_compat_netbsd.h"
@@ -466,7 +466,7 @@ void
 child_return(void *arg)
 {
 	struct lwp *l = arg;
-	/* See cpu_fork() */
+	/* See cpu_lwp_fork() */
 	struct frame *f = (struct frame *)l->l_md.md_regs;
 
 	f->f_regs[D0] = 0;
diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s
index 135c665434a3..c428f6ec892e 100644
--- a/sys/arch/mac68k/mac68k/locore.s
+++ b/sys/arch/mac68k/mac68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.159 2009/12/12 09:55:44 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.160 2010/02/25 07:17:48 skrll Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -371,7 +371,7 @@ Lnocache0:
 	jbsr	_C_LABEL(mac68k_init)
 
 /*
- * Create a fake exception frame so that cpu_fork() can copy it.
+ * Create a fake exception frame so that cpu_lwp_fork() can copy it.
  * main() nevers returns; we exit to user mode from a forked process
  * later on.
  */
diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s
index 660e258304d9..3ed9bef3da0a 100644
--- a/sys/arch/mvme68k/mvme68k/locore.s
+++ b/sys/arch/mvme68k/mvme68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.104 2009/12/13 11:24:03 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.105 2010/02/25 07:17:48 skrll Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -689,7 +689,7 @@ Ltbia040:
 Lenab3:
 /*
  * final setup for C code:
- * Create a fake exception frame so that cpu_fork() can copy it.
+ * Create a fake exception frame so that cpu_lwp_fork() can copy it.
  * main() nevers returns; we exit to user mode from a forked process
  * later on.
  */
diff --git a/sys/arch/news68k/news68k/locore.s b/sys/arch/news68k/news68k/locore.s
index b612385b6eb9..d293482aff2f 100644
--- a/sys/arch/news68k/news68k/locore.s
+++ b/sys/arch/news68k/news68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.52 2009/12/13 11:24:03 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.53 2010/02/25 07:17:49 skrll Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -489,7 +489,7 @@ Lenab3:
 	jbsr	_C_LABEL(news68k_init)	| additional pre-main initialization
 
 /*
- * Create a fake exception frame so that cpu_fork() can copy it.
+ * Create a fake exception frame so that cpu_lwp_fork() can copy it.
  * main() nevers returns; we exit to user mode from a forked process
  * later on.
  */
diff --git a/sys/arch/next68k/next68k/locore.s b/sys/arch/next68k/next68k/locore.s
index f8671dcda3b0..cbf00a5dc022 100644
--- a/sys/arch/next68k/next68k/locore.s
+++ b/sys/arch/next68k/next68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.54 2009/12/13 11:24:03 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.55 2010/02/25 07:17:49 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -484,7 +484,7 @@ Lenab3:
 
 /* Final setup for call to main(). */
 /*
- * Create a fake exception frame so that cpu_fork() can copy it.
+ * Create a fake exception frame so that cpu_lwp_fork() can copy it.
  * main() nevers returns; we exit to user mode from a forked process
  * later on.
  */
diff --git a/sys/arch/x68k/x68k/locore.s b/sys/arch/x68k/x68k/locore.s
index 6a806b6b11c3..a9296478397c 100644
--- a/sys/arch/x68k/x68k/locore.s
+++ b/sys/arch/x68k/x68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.96 2009/12/13 11:24:04 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.97 2010/02/25 07:17:49 skrll Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -969,7 +969,7 @@ Lenab3:
 	movl	%d6,_C_LABEL(bootdev)	|   and boot device
 
 /*
- * Create a fake exception frame so that cpu_fork() can copy it.
+ * Create a fake exception frame so that cpu_lwp_fork() can copy it.
  * main() nevers returns; we exit to user mode from a forked process
  * later on.
  */