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

Sat Mar 3 12:24:59 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/e5663816b670
changeset: 415:e5663816b670
user:      ray at terran.dlink.ua
date:      Sat Mar 03 12:43:33 2012 +0200
description:
Unbreak trap.c

diffstat:

 head/sys/mips/mips/trap.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 6fd2152eeca3 -r e5663816b670 head/sys/mips/mips/trap.c

--- a/head/sys/mips/mips/trap.c	Sat Mar 03 12:26:05 2012 +0200
+++ b/head/sys/mips/mips/trap.c	Sat Mar 03 12:43:33 2012 +0200
@@ -39,7 +39,7 @@
  *	JNPR: trap.c,v 1.13.2.2 2007/08/29 10:03:49 girish
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/mips/mips/trap.c 232449 2012-03-03 08:19:18Z jmallett $");
+__FBSDID("$FreeBSD: head/sys/mips/mips/trap.c 232452 2012-03-03 10:22:49Z jmallett $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -351,7 +351,7 @@
 			sa->args[6] = locr0->t6;
 			sa->args[7] = locr0->t7;
 			nsaved += 4;
-#if defined (__mips_n32) || defined(__mips_n64)
+#ifdef COMPAT_FREEBSD32
 		}
 #endif
 #endif
