Module Name: src
Committed By: rin
Date: Tue Mar 30 03:15:54 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora: machdep.c
src/sys/arch/evbppc/virtex: design_gsrd2.c
src/sys/arch/powerpc/ibm4xx: pmap.c
src/sys/arch/powerpc/include/ibm4xx: tlb.h
src/sys/arch/powerpc/powerpc: db_interface.c
Removed Files:
src/sys/arch/evbppc/include: tlb.h
Log Message:
G/C misleading <evbppc/tlb.h>. Use <powerpc/ibm4xx/tlb.h> directly.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbppc/include/tlb.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/virtex/design_gsrd2.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/ibm4xx/tlb.h
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/powerpc/powerpc/db_interface.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/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.49 src/sys/arch/evbppc/explora/machdep.c:1.50
--- src/sys/arch/evbppc/explora/machdep.c:1.49 Tue Mar 30 03:04:51 2021
+++ src/sys/arch/evbppc/explora/machdep.c Tue Mar 30 03:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.49 2021/03/30 03:04:51 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.50 2021/03/30 03:15:53 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2021/03/30 03:04:51 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2021/03/30 03:15:53 rin Exp $");
#include "opt_explora.h"
@@ -43,13 +43,13 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <prop/proplib.h>
#include <machine/explora.h>
-#include <machine/tlb.h>
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dcr403cgx.h>
+#include <powerpc/ibm4xx/tlb.h>
#define TLB_PG_SIZE (16*1024*1024)
Index: src/sys/arch/evbppc/virtex/design_gsrd2.c
diff -u src/sys/arch/evbppc/virtex/design_gsrd2.c:1.5 src/sys/arch/evbppc/virtex/design_gsrd2.c:1.6
--- src/sys/arch/evbppc/virtex/design_gsrd2.c:1.5 Mon Mar 29 13:14:13 2021
+++ src/sys/arch/evbppc/virtex/design_gsrd2.c Tue Mar 30 03:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: design_gsrd2.c,v 1.5 2021/03/29 13:14:13 rin Exp $ */
+/* $NetBSD: design_gsrd2.c,v 1.6 2021/03/30 03:15:53 rin Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -32,7 +32,7 @@
#include "opt_virtex.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.5 2021/03/29 13:14:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.6 2021/03/30 03:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,9 +45,9 @@ __KERNEL_RCSID(0, "$NetBSD: design_gsrd2
#include <sys/intr.h>
#include <machine/powerpc.h>
-#include <machine/tlb.h>
#include <powerpc/ibm4xx/cpu.h>
+#include <powerpc/ibm4xx/tlb.h>
#include <powerpc/ibm4xx/dev/plbvar.h>
#include <evbppc/virtex/dev/xcvbusvar.h>
Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.95 src/sys/arch/powerpc/ibm4xx/pmap.c:1.96
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.95 Thu Sep 10 04:36:24 2020
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Tue Mar 30 03:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.95 2020/09/10 04:36:24 rin Exp $ */
+/* $NetBSD: pmap.c,v 1.96 2021/03/30 03:15:53 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.95 2020/09/10 04:36:24 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.96 2021/03/30 03:15:53 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -86,7 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.9
#include <uvm/uvm.h>
#include <machine/powerpc.h>
-#include <machine/tlb.h>
#include <powerpc/pcb.h>
@@ -94,6 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.9
#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/cpu.h>
+#include <powerpc/ibm4xx/tlb.h>
/*
* kernmap is an array of PTEs large enough to map in
Index: src/sys/arch/powerpc/include/ibm4xx/tlb.h
diff -u src/sys/arch/powerpc/include/ibm4xx/tlb.h:1.6 src/sys/arch/powerpc/include/ibm4xx/tlb.h:1.7
--- src/sys/arch/powerpc/include/ibm4xx/tlb.h:1.6 Thu Mar 5 02:14:53 2020
+++ src/sys/arch/powerpc/include/ibm4xx/tlb.h Tue Mar 30 03:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tlb.h,v 1.6 2020/03/05 02:14:53 rin Exp $ */
+/* $NetBSD: tlb.h,v 1.7 2021/03/30 03:15:53 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -104,8 +104,12 @@ int ppc4xx_tlb_new_pid(struct pmap *);
void ppc4xx_tlb_reserve(paddr_t, vaddr_t, size_t, int);
void *ppc4xx_tlb_mapiodev(paddr_t, psize_t);
+#ifndef ppc4xx_tlbflags
+#define ppc4xx_tlbflags(va, pa) (0)
#endif
+#endif /* !_LOCORE */
+
#define TLB_PID_INVALID 0xFFFF
#endif /* _IBM4XX_TLB_H_ */
Index: src/sys/arch/powerpc/powerpc/db_interface.c
diff -u src/sys/arch/powerpc/powerpc/db_interface.c:1.55 src/sys/arch/powerpc/powerpc/db_interface.c:1.56
--- src/sys/arch/powerpc/powerpc/db_interface.c:1.55 Tue Feb 23 07:13:52 2021
+++ src/sys/arch/powerpc/powerpc/db_interface.c Tue Mar 30 03:15:53 2021
@@ -1,8 +1,8 @@
-/* $NetBSD: db_interface.c,v 1.55 2021/02/23 07:13:52 mrg Exp $ */
+/* $NetBSD: db_interface.c,v 1.56 2021/03/30 03:15:53 rin Exp $ */
/* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.55 2021/02/23 07:13:52 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.56 2021/03/30 03:15:53 rin Exp $");
#define USERACC
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_interface
#ifdef PPC_IBM4XX
#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/spr.h>
-#include <machine/tlb.h>
+#include <powerpc/ibm4xx/tlb.h>
#include <uvm/uvm_extern.h>
#endif
