Module Name: src
Committed By: jmcneill
Date: Sat Oct 17 16:34:43 UTC 2015
Modified Files:
src/sys/arch/arm/include: cpufunc.h
src/sys/arch/arm/xscale: pxa2x0_lcd.c
src/sys/arch/shark/ofw: ofw.c
Log Message:
remove tlb_flush define and change callers to use cpu_tlb_flushID directly, ok
matt@
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/arm/include/cpufunc.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/xscale/pxa2x0_lcd.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/shark/ofw/ofw.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/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.74 src/sys/arch/arm/include/cpufunc.h:1.75
--- src/sys/arch/arm/include/cpufunc.h:1.74 Sun Apr 20 16:06:05 2014
+++ src/sys/arch/arm/include/cpufunc.h Sat Oct 17 16:34:43 2015
@@ -230,7 +230,6 @@ void cpufunc_domains (u_int);
u_int cpufunc_faultstatus (void);
u_int cpufunc_faultaddress (void);
-#define tlb_flush cpu_tlb_flushID
#define setttb cpu_setttb
#define drain_writebuf cpu_drain_writebuf
Index: src/sys/arch/arm/xscale/pxa2x0_lcd.c
diff -u src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.35 src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.36
--- src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.35 Sat Feb 22 19:03:06 2014
+++ src/sys/arch/arm/xscale/pxa2x0_lcd.c Sat Oct 17 16:34:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_lcd.c,v 1.35 2014/02/22 19:03:06 matt Exp $ */
+/* $NetBSD: pxa2x0_lcd.c,v 1.36 2015/10/17 16:34:43 jmcneill Exp $ */
/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.35 2014/02/22 19:03:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.36 2015/10/17 16:34:43 jmcneill Exp $");
#include "opt_pxa2x0_lcd.h"
@@ -566,7 +566,7 @@ pxa2x0_lcd_new_screen(struct pxa2x0_lcd_
PTE_SYNC(ptep);
va += PAGE_SIZE;
}
- tlb_flush();
+ cpu_tlb_flushID();
}
memset(scr->buf_va, 0, scr->buf_size);
Index: src/sys/arch/shark/ofw/ofw.c
diff -u src/sys/arch/shark/ofw/ofw.c:1.63 src/sys/arch/shark/ofw/ofw.c:1.64
--- src/sys/arch/shark/ofw/ofw.c:1.63 Sat Feb 22 18:55:53 2014
+++ src/sys/arch/shark/ofw/ofw.c Sat Oct 17 16:34:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.63 2014/02/22 18:55:53 matt Exp $ */
+/* $NetBSD: ofw.c,v 1.64 2015/10/17 16:34:43 jmcneill Exp $ */
/*
* Copyright 1997
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.63 2014/02/22 18:55:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.64 2015/10/17 16:34:43 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1062,7 +1062,7 @@ ofw_callbackhandler(void *v)
}
/* Clean out tlb. */
- tlb_flush();
+ cpu_tlb_flushID();
args_n_results[nargs + 1] = 0;
args->nreturns = 2;
@@ -1106,7 +1106,7 @@ ofw_callbackhandler(void *v)
}
/* Clean out tlb. */
- tlb_flush();
+ cpu_tlb_flushID();
args->nreturns = 1;
} else if (strcmp(name, "translate") == 0) {
