CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Sat Sep  5 03:23:31 UTC 2009

Modified Files:
        src/sys/arch/mips/mips [matt-nb5-mips64]: cache_mipsNN.c

Log Message:
assign vaddr_t to unsigned int makes LP64 code very unhappy.


To generate a diff of this commit:
cvs rdiff -u -r1.11.78.1 -r1.11.78.2 src/sys/arch/mips/mips/cache_mipsNN.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/mips/mips/cache_mipsNN.c
diff -u src/sys/arch/mips/mips/cache_mipsNN.c:1.11.78.1 src/sys/arch/mips/mips/cache_mipsNN.c:1.11.78.2
--- src/sys/arch/mips/mips/cache_mipsNN.c:1.11.78.1	Thu Aug 20 07:59:09 2009
+++ src/sys/arch/mips/mips/cache_mipsNN.c	Sat Sep  5 03:23:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache_mipsNN.c,v 1.11.78.1 2009/08/20 07:59:09 matt Exp $	*/
+/*	$NetBSD: cache_mipsNN.c,v 1.11.78.2 2009/09/05 03:23:31 matt Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache_mipsNN.c,v 1.11.78.1 2009/08/20 07:59:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache_mipsNN.c,v 1.11.78.2 2009/09/05 03:23:31 matt Exp $");
 
 #include <sys/param.h>
 
@@ -47,11 +47,11 @@
 
 #include <uvm/uvm_extern.h>
 
-#define	round_line16(x)		(((x) + 15) & ~15)
-#define	trunc_line16(x)		((x) & ~15)
+#define	round_line16(x)		(((x) + 15L) & -16L)
+#define	trunc_line16(x)		((x) & -16L)
 
-#define	round_line32(x)		(((x) + 31) & ~31)
-#define	trunc_line32(x)		((x) & ~31)
+#define	round_line32(x)		(((x) + 31L) & -32L)
+#define	trunc_line32(x)		((x) & -32L)
 
 
 #ifdef SB1250_PASS1
@@ -209,7 +209,7 @@
 void
 mipsNN_icache_sync_range_index_16(vaddr_t va, vsize_t size)
 {
-	unsigned int eva, tmpva;
+	vaddr_t eva, tmpva;
 	int i, stride, loopcount;
 
 	/*
@@ -252,7 +252,7 @@
 void
 mipsNN_icache_sync_range_index_32(vaddr_t va, vsize_t size)
 {
-	unsigned int eva, tmpva;
+	vaddr_t eva, tmpva;
 	int i, stride, loopcount;
 
 	/*
@@ -383,7 +383,7 @@
 void
 mipsNN_pdcache_wbinv_range_index_16(vaddr_t va, vsize_t size)
 {
-	unsigned int eva, tmpva;
+	vaddr_t eva, tmpva;
 	int i, stride, loopcount;
 
 	/*
@@ -424,7 +424,7 @@
 void
 mipsNN_pdcache_wbinv_range_index_32(vaddr_t va, vsize_t size)
 {
-	unsigned int eva, tmpva;
+	vaddr_t eva, tmpva;
 	int i, stride, loopcount;
 
 	/*