From owner-p4-projects@FreeBSD.ORG  Thu Jan  3 23:44:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6FE2016A418; Thu,  3 Jan 2008 23:44:42 +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 3596116A504
	for <perforce@freebsd.org>; Thu,  3 Jan 2008 23:44:42 +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 2632113C465
	for <perforce@freebsd.org>; Thu,  3 Jan 2008 23:44:42 +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 m03NigoA074188
	for <perforce@freebsd.org>; Thu, 3 Jan 2008 23:44:42 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m03NiflL074185
	for perforce@freebsd.org; Thu, 3 Jan 2008 23:44:41 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 3 Jan 2008 23:44:41 GMT
Message-Id: <200801032344.m03NiflL074185@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 132446 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: Thu, 03 Jan 2008 23:44:42 -0000

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

Change 132446 by imp@imp_paco-paco on 2008/01/03 23:44:05

	Checkpoint the easy fixes to malta_machdep.c

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#6 edit
.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/malta_machdep.c#2 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#6 (text+ko) ====

@@ -67,9 +67,10 @@
 #define	MIPS_VA_TO_CINDEX(x)		((unsigned)(x) & 0xffffff | MIPS_CACHED_MEMORY_ADDR)
 #define	MIPS_CACHED_TO_UNCACHED(x)	(MIPS_PHYS_TO_UNCACHED(MIPS_CACHED_TO_PHYS(x)))
 
-#define	MIPS_PHYS_TO_KSEG0(x)		((x) | MIPS_KSEG0_START)
-#define	MIPS_PHYS_TO_KSEG1(x)		((x) | MIPS_KSEG1_START)
-#define	MIPS_KSEG1_TO_PHYS(x)		((x) & MIPS_PHYS_MASK)
+#define	MIPS_PHYS_TO_KSEG0(x)		((unsigned)(x) | MIPS_KSEG0_START)
+#define	MIPS_PHYS_TO_KSEG1(x)		((unsigned)(x) | MIPS_KSEG1_START)
+#define	MIPS_KSEG0_TO_PHYS(x)		((unsigned)(x) & MIPS_PHYS_MASK)
+#define	MIPS_KSEG1_TO_PHYS(x)		((unsigned)(x) & MIPS_PHYS_MASK)
 
 /*
  *  Status register.

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

@@ -57,6 +57,7 @@
 #include <vm/vm_pager.h>
 
 #include <machine/clock.h>
+#include <machine/cpu.h>
 #include <machine/cpuregs.h>
 #include <machine/hwfunc.h>
 #include <machine/md_var.h>