From owner-svn-src-user@FreeBSD.ORG  Tue Jul 20 05:14:28 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E6151065677;
	Tue, 20 Jul 2010 05:14:28 +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 3A9CE8FC1B;
	Tue, 20 Jul 2010 05:14:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6K5ESZ5094718;
	Tue, 20 Jul 2010 05:14:28 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6K5ESJj094715;
	Tue, 20 Jul 2010 05:14:28 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201007200514.o6K5ESJj094715@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 20 Jul 2010 05:14:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210279 - in user/jmallett/octeon/sys/mips: cavium mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jul 2010 05:14:28 -0000

Author: jmallett
Date: Tue Jul 20 05:14:27 2010
New Revision: 210279
URL: http://svn.freebsd.org/changeset/base/210279

Log:
  Fix after merge.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_mp.c
  user/jmallett/octeon/sys/mips/mips/pmap.c

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_mp.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_mp.c	Tue Jul 20 04:46:04 2010	(r210278)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_mp.c	Tue Jul 20 05:14:27 2010	(r210279)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 #include <machine/hwfunc.h>
+#include <machine/md_var.h>
 #include <machine/smp.h>
 
 #include <mips/cavium/octeon_pcmap_regs.h>
@@ -95,7 +96,7 @@ platform_init_ap(int cpuid)
 	 */
 	clock_int_mask = hard_int_mask(5);
 	ipi_int_mask = hard_int_mask(platform_ipi_intrnum());
-	set_intr_mask(ALL_INT_MASK & ~(ipi_int_mask | clock_int_mask));
+	set_intr_mask(MIPS_SR_INT_MASK & ~(ipi_int_mask | clock_int_mask));
 
 	mips_wbflush();
 }

Modified: user/jmallett/octeon/sys/mips/mips/pmap.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/pmap.c	Tue Jul 20 04:46:04 2010	(r210278)
+++ user/jmallett/octeon/sys/mips/mips/pmap.c	Tue Jul 20 05:14:27 2010	(r210279)
@@ -453,8 +453,6 @@ again:
 		}
 	}
 #endif
-
-#endif
 	/*
 	 * Allocate segment table for the kernel
 	 */