Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/mips/mips/cpu_subr.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/mips/mips/cpu_subr.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -p -r1.1.2.25 -r1.1.2.26
--- src/sys/arch/mips/mips/cpu_subr.c	2012/02/27 17:04:39	1.1.2.25
+++ src/sys/arch/mips/mips/cpu_subr.c	2012/08/04 07:20:31	1.1.2.26
@@ -80,9 +80,13 @@ struct cpu_info cpu_info_store
 	.ci_fpcurlwp = &lwp0,
 #endif
 	.ci_tlb_info = &pmap_tlb0_info,
-	.ci_pmap_seg0tab = (void *)(MIPS_KSEG2_START + 0x1eadbeef),
+	.ci_pmap_seg0tab = {
+		[0] = (void *)(MIPS_KSEG2_START + 0x1eadbeef),
+	},
 #ifdef _LP64
-	.ci_pmap_segtab = (void *)(MIPS_KSEG2_START + 0x1eadbeef),
+	.ci_pmap_segtab = {
+		[0] = (void *)(MIPS_KSEG2_START + 0x1eadbeef),
+	},
 #endif
 	.ci_cpl = IPL_HIGH,
 	.ci_tlb_slot = -1,
@@ -161,6 +165,11 @@ cpu_info_alloc(struct pmap_tlb_info *ti,
         ci->ci_divisor_recip = cpu_info_store.ci_divisor_recip;
 	ci->ci_cpuwatch_count = cpu_info_store.ci_cpuwatch_count;
 
+#ifdef _LP64
+	ci->ci_pmap_segtab[1] = cpu_info_store.ci_pmap_segtab[1];
+#endif
+	ci->ci_pmap_seg0tab[1] = cpu_info_store.ci_pmap_seg0tab[1];
+
 	/*
 	 * Attach its TLB info (which must be direct-mapped)
 	 */