From owner-svn-src-all@FreeBSD.ORG  Sat Mar  3 10:22:49 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F089C106566C;
	Sat,  3 Mar 2012 10:22:49 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E00238FC16;
	Sat,  3 Mar 2012 10:22:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q23AMnd6075184;
	Sat, 3 Mar 2012 10:22:49 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q23AMnlK075182;
	Sat, 3 Mar 2012 10:22:49 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203031022.q23AMnlK075182@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 3 Mar 2012 10:22:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232452 - head/sys/mips/mips
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 10:22:50 -0000

Author: jmallett
Date: Sat Mar  3 10:22:49 2012
New Revision: 232452
URL: http://svn.freebsd.org/changeset/base/232452

Log:
  Unbreak n64 build without COMPAT_FREEBSD32 by fixing mismatched preprocessor
  conditionals.

Modified:
  head/sys/mips/mips/trap.c

Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c	Sat Mar  3 10:11:18 2012	(r232451)
+++ head/sys/mips/mips/trap.c	Sat Mar  3 10:22:49 2012	(r232452)
@@ -351,7 +351,7 @@ cpu_fetch_syscall_args(struct thread *td
 			sa->args[6] = locr0->t6;
 			sa->args[7] = locr0->t7;
 			nsaved += 4;
-#if defined (__mips_n32) || defined(__mips_n64)
+#ifdef COMPAT_FREEBSD32
 		}
 #endif
 #endif