From owner-p4-projects@FreeBSD.ORG  Tue Jan 15 22:57:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 204F216A41B; Tue, 15 Jan 2008 22:57:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9FBC16A41A
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 22:57:49 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C6F5A13C448
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 22:57:49 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0FMvnsP082684
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 22:57:49 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FMvncj082681
	for perforce@freebsd.org; Tue, 15 Jan 2008 22:57:49 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 15 Jan 2008 22:57:49 GMT
Message-Id: <200801152257.m0FMvncj082681@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133362 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jan 2008 22:57:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=133362

Change 133362 by imp@imp_lighthouse on 2008/01/15 22:57:10

	Integrate changes 133359 and 133360 from mips2 branch

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/busdma_machdep.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#10 integrate

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/busdma_machdep.c#2 (text+ko) ====

@@ -25,6 +25,8 @@
  *
  */
 
+#define NO_DMA
+
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#10 (text+ko) ====

@@ -196,8 +196,8 @@
 	/* Call the platform-specific startup code. */
 	jal	platform_start
 	sw	zero, START_FRAME - 8(sp)	# Zero out old fp for debugger
-	nop
 
+	/* Is this necessary here? -- xxximp */
 	la	sp, _C_LABEL(thread0)
 	lw	a0, TD_PCB(sp)
 	subu	sp, a0, START_FRAME