diff --git a/sys/mips/adm5120/adm5120_machdep.c b/sys/mips/adm5120/adm5120_machdep.c
index 94639385b384..15ecef26005f 100644
--- a/sys/mips/adm5120/adm5120_machdep.c
+++ b/sys/mips/adm5120/adm5120_machdep.c
@@ -155,7 +155,7 @@ platform_start(__register_t a0 __unused, __register_t a1 __unused,
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
 	/* Initialize pcpu stuff */
-	mips_pcpu_init();
+	mips_pcpu0_init();
 
 	cninit();
 	mips_init();
diff --git a/sys/mips/alchemy/alchemy_machdep.c b/sys/mips/alchemy/alchemy_machdep.c
index bf03947e111b..119c93ea03ef 100644
--- a/sys/mips/alchemy/alchemy_machdep.c
+++ b/sys/mips/alchemy/alchemy_machdep.c
@@ -155,7 +155,7 @@ platform_start(__register_t a0 __unused, __register_t a1 __unused,
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
 	/* Initialize pcpu stuff */
-	mips_pcpu_init();
+	mips_pcpu0_init();
 
 	cninit();
 	mips_init();
diff --git a/sys/mips/atheros/ar71xx_machdep.c b/sys/mips/atheros/ar71xx_machdep.c
index 2736018809a1..eaf08f27e780 100644
--- a/sys/mips/atheros/ar71xx_machdep.c
+++ b/sys/mips/atheros/ar71xx_machdep.c
@@ -153,7 +153,7 @@ platform_start(__register_t a0 __unused, __register_t a1 __unused,
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
 	/* Initialize pcpu stuff */
-	mips_pcpu_init();
+	mips_pcpu0_init();
 
 	argc = a0;
 	argv = (char**)a1;
diff --git a/sys/mips/idt/idt_machdep.c b/sys/mips/idt/idt_machdep.c
index 0d83dc5e4224..eebe608e8116 100644
--- a/sys/mips/idt/idt_machdep.c
+++ b/sys/mips/idt/idt_machdep.c
@@ -138,7 +138,7 @@ platform_start(__register_t a0, __register_t a1,
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
 	/* Initialize pcpu stuff */
-	mips_pcpu_init();
+	mips_pcpu0_init();
 
 	/*
 	 * Looking for mem=XXM argument
diff --git a/sys/mips/include/md_var.h b/sys/mips/include/md_var.h
index f7210ffa26ce..a523851ca5fb 100644
--- a/sys/mips/include/md_var.h
+++ b/sys/mips/include/md_var.h
@@ -66,6 +66,7 @@ int	is_physical_memory(vm_offset_t addr);
 void	mips_vector_init(void);
 void	cpu_identify(void);
 void	mips_cpu_init(void);
+void	mips_pcpu0_init(void);
 void	mips_proc0_init(void);
 
 /* Platform call-downs. */
diff --git a/sys/mips/malta/malta_machdep.c b/sys/mips/malta/malta_machdep.c
index d67f2492fb72..c596d4f936d4 100644
--- a/sys/mips/malta/malta_machdep.c
+++ b/sys/mips/malta/malta_machdep.c
@@ -294,6 +294,7 @@ platform_start(__register_t a0, __register_t a1,  __register_t a2,
 	kernend = round_page((vm_offset_t)&end);
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
+	mips_pcpu0_init();
 	platform_counter_freq = malta_cpu_freq();
 	mips_timer_early_init(platform_counter_freq);
 
diff --git a/sys/mips/mips/machdep.c b/sys/mips/mips/machdep.c
index 6bd430d7cef4..65b4cfb7e9e5 100644
--- a/sys/mips/mips/machdep.c
+++ b/sys/mips/mips/machdep.c
@@ -256,7 +256,7 @@ SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, CTLFLAG_RW,
  * Initialize per cpu data structures, include curthread.
  */
 void
-mips_pcpu_init()
+mips_pcpu0_init()
 {
 	/* Initialize pcpu info of cpu-zero */
 #ifdef SMP
diff --git a/sys/mips/octeon1/octeon_machdep.c b/sys/mips/octeon1/octeon_machdep.c
index 8da0c3c13b70..adec47b07417 100644
--- a/sys/mips/octeon1/octeon_machdep.c
+++ b/sys/mips/octeon1/octeon_machdep.c
@@ -653,7 +653,7 @@ platform_start(__register_t a0, __register_t a1, __register_t a2 __unused,
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
 	/* Initialize pcpu stuff */
-	mips_pcpu_init();
+	mips_pcpu0_init();
 
 	octeon_boot_params_init(a3);
 	/* XXX octeon boot decriptor has args in it... */
diff --git a/sys/mips/rmi/xlr_machdep.c b/sys/mips/rmi/xlr_machdep.c
index 5de015f7c50b..80827b57bafb 100644
--- a/sys/mips/rmi/xlr_machdep.c
+++ b/sys/mips/rmi/xlr_machdep.c
@@ -388,7 +388,7 @@ platform_start(__register_t a0 __unused,
 	/* XXX no zeroing of BSS? */
 
 	/* Initialize pcpu stuff */
-	mips_pcpu_init();
+	mips_pcpu0_init();
 
 	/* XXX FIXME the code below is not 64 bit clean */
 	/* Save boot loader and other stuff from scratch regs */
diff --git a/sys/mips/sentry5/s5_machdep.c b/sys/mips/sentry5/s5_machdep.c
index e3cb9eba9d21..6c4264dc220b 100644
--- a/sys/mips/sentry5/s5_machdep.c
+++ b/sys/mips/sentry5/s5_machdep.c
@@ -189,7 +189,7 @@ platform_start(__register_t a0, __register_t a1, __register_t a2,
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
 	/* Initialize pcpu stuff */
-	mips_pcpu_init();
+	mips_pcpu0_init();
 
 #ifdef CFE
 	/*
diff --git a/sys/mips/sibyte/sb_machdep.c b/sys/mips/sibyte/sb_machdep.c
index 4cb42cdb826c..8bb265c5a668 100644
--- a/sys/mips/sibyte/sb_machdep.c
+++ b/sys/mips/sibyte/sb_machdep.c
@@ -241,7 +241,7 @@ platform_start(__register_t a0, __register_t a1, __register_t a2,
 	kernend = round_page((vm_offset_t)&end);
 
 	/* Initialize pcpu stuff */
-	mips_pcpu_init();
+	mips_pcpu0_init();
 
 #ifdef CFE
 	/*