[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/939d6d22eab9
changeset: 417:939d6d22eab9
user:      ray at terran.dlink.ua
date:      Mon Mar 05 13:39:02 2012 +0200
description:
Update sys/mips to r232540.

diffstat:

 head/sys/mips/mips/vm_machdep.c |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 62771ba62686 -r 939d6d22eab9 head/sys/mips/mips/vm_machdep.c
--- a/head/sys/mips/mips/vm_machdep.c	Sat Mar 03 14:25:04 2012 +0200
+++ b/head/sys/mips/mips/vm_machdep.c	Mon Mar 05 13:39:02 2012 +0200
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/mips/mips/vm_machdep.c 232449 2012-03-03 08:19:18Z jmallett $");
+__FBSDID("$FreeBSD: head/sys/mips/mips/vm_machdep.c 232478 2012-03-04 05:19:55Z jmallett $");
 
 #include "opt_compat.h"
 #include "opt_cputype.h"
@@ -618,14 +618,18 @@
 
 #ifdef __mips_n64
 #ifdef COMPAT_FREEBSD32
-	if (SV_PROC_FLAG(td->td_proc, SV_ILP32))
-		td->td_md.md_tls = (char*)tls_base + 0x7008;
+	if (!SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
 #endif
-	td->td_md.md_tls = (char*)tls_base + 0x7010;
-#else
+		td->td_md.md_tls = (char*)tls_base + 0x7010;
+		return (0);
+#ifdef COMPAT_FREEBSD32
+	}
+#endif
+#endif
+#if !defined(__mips_n64) || defined(COMPAT_FREEBSD32)
 	td->td_md.md_tls = (char*)tls_base + 0x7008;
+	return (0);
 #endif
-	return (0);
 }
 
 #ifdef DDB