Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Jan 2008 23:44:41 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 132446 for review
Message-ID:  <200801032344.m03NiflL074185@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801032344.m03NiflL074185>