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

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Thu Mar 11 08:09:15 UTC 2010

Modified Files:
        src/sys/arch/mips/include [matt-nb5-mips64]: intr.h
        src/sys/arch/mips/mips [matt-nb5-mips64]: ipifuncs.c

Log Message:
s/IPI_ISYNC/IPI_SYNCICACHE/


To generate a diff of this commit:
cvs rdiff -u -r1.3.96.7 -r1.3.96.8 src/sys/arch/mips/include/intr.h
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/mips/ipifuncs.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/include/intr.h
diff -u src/sys/arch/mips/include/intr.h:1.3.96.7 src/sys/arch/mips/include/intr.h:1.3.96.8
--- src/sys/arch/mips/include/intr.h:1.3.96.7	Sun Feb 28 23:45:07 2010
+++ src/sys/arch/mips/include/intr.h	Thu Mar 11 08:09:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.3.96.7 2010/02/28 23:45:07 matt Exp $ */
+/* $NetBSD: intr.h,v 1.3.96.8 2010/03/11 08:09:15 matt Exp $ */
 /*-
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -57,7 +57,7 @@
 #define	IPI_NOP		0		/* do nothing, interrupt only */
 #define	IPI_SHOOTDOWN	1		/* do a tlb shootdown */
 #define	IPI_FPSAVE	2		/* save current fp registers */
-#define	IPI_ISYNC	3		/* sync icache for pages */
+#define	IPI_SYNCICACHE	3		/* sync icache for pages */
 #define	IPI_KPREEMPT	4		/* schedule a kernel preemption */
 #define	NIPIS		5
 

Index: src/sys/arch/mips/mips/ipifuncs.c
diff -u src/sys/arch/mips/mips/ipifuncs.c:1.1.2.1 src/sys/arch/mips/mips/ipifuncs.c:1.1.2.2
--- src/sys/arch/mips/mips/ipifuncs.c:1.1.2.1	Sun Feb 28 23:45:06 2010
+++ src/sys/arch/mips/mips/ipifuncs.c	Thu Mar 11 08:09:15 2010
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.1.2.1 2010/02/28 23:45:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.1.2.2 2010/03/11 08:09:15 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -43,7 +43,7 @@
 	[IPI_NOP]	= "ipi nop",
 	[IPI_SHOOTDOWN]	= "ipi shootdown",
 	[IPI_FPSAVE]	= "ipi fpsave",
-	[IPI_ISYNC]	= "ipi isync",
+	[IPI_SYNCICACHE]	= "ipi isync",
 	[IPI_KPREEMPT]	= "ipi kpreempt",
 };
 
@@ -75,9 +75,9 @@
 }
 
 static inline void
-ipi_isync(struct cpu_info *ci)
+ipi_syncicache(struct cpu_info *ci)
 {
-	mips_icache_sync_all();
+	pmap_tlb_syncicache_wanted(ci);
 }
 
 static inline void
@@ -97,8 +97,8 @@
 		ipi_shootdown(ci);
 	if (ipi_mask & __BIT(IPI_FPSAVE))
 		ipi_fpsave(ci);
-	if (ipi_mask & __BIT(IPI_ISYNC))
-		ipi_isync(ci);
+	if (ipi_mask & __BIT(IPI_SYNCICACHE))
+		ipi_syncicache(ci);
 #ifdef IPI_HALT
 	if (ipi_mask & __BIT(IPI_HALT))
 		ipi_halt();