From owner-svn-src-user@FreeBSD.ORG  Fri May 28 20:39:30 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 8ECFD10656D6;
	Fri, 28 May 2010 20:39:30 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E83E8FC19;
	Fri, 28 May 2010 20:39:30 +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 o4SKdUhk002339;
	Fri, 28 May 2010 20:39:30 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4SKdUYB002337;
	Fri, 28 May 2010 20:39:30 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201005282039.o4SKdUYB002337@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 28 May 2010 20:39:30 +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: r208628 - in user/jmallett/octeon/sys: ddb mips/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: Fri, 28 May 2010 20:39:30 -0000

Author: jmallett
Date: Fri May 28 20:39:30 2010
New Revision: 208628
URL: http://svn.freebsd.org/changeset/base/208628

Log:
  Update for merged changes.

Modified:
  user/jmallett/octeon/sys/ddb/db_command.c
  user/jmallett/octeon/sys/mips/mips/pmap.c

Modified: user/jmallett/octeon/sys/ddb/db_command.c
==============================================================================
--- user/jmallett/octeon/sys/ddb/db_command.c	Fri May 28 20:10:10 2010	(r208627)
+++ user/jmallett/octeon/sys/ddb/db_command.c	Fri May 28 20:39:30 2010	(r208628)
@@ -672,11 +672,7 @@ out:
 #endif
 
 static void
-db_reset(dummy1, dummy2, dummy3, dummy4)
-	intptr_t	dummy1;
-	boolean_t	dummy2;
-	db_expr_t	dummy3;
-	char *		dummy4;
+db_reset(intptr_t addr, boolean_t have_addr, db_expr_t count, char *modif)
 {
 	int delay, loop;
 

Modified: user/jmallett/octeon/sys/mips/mips/pmap.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/pmap.c	Fri May 28 20:10:10 2010	(r208627)
+++ user/jmallett/octeon/sys/mips/mips/pmap.c	Fri May 28 20:39:30 2010	(r208628)
@@ -3032,10 +3032,6 @@ pmap_kextract(vm_offset_t va)
 
 		/* Is the kernel pmap initialized? */
 		if (kernel_pmap->pm_active) {
-			if (va < (vm_offset_t)virtual_sys_start) {
-				panic("%s for special address %p.", __func__, (void *)va);
-			}
-
 			/* Its inside the virtual address range */
 			ptep = pmap_pte(kernel_pmap, va);
 			if (ptep) {