Module Name: src
Committed By: christos
Date: Tue Oct 2 23:51:39 UTC 2012
Modified Files:
src/sys/arch/powerpc/conf: files.powerpc
src/sys/arch/powerpc/include/booke: cpuvar.h pmap.h vmparam.h
Log Message:
move common tlb stuff to uvm
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/powerpc/conf/files.powerpc
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/booke/cpuvar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/booke/pmap.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/booke/vmparam.h
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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.83 src/sys/arch/powerpc/conf/files.powerpc:1.84
--- src/sys/arch/powerpc/conf/files.powerpc:1.83 Thu Mar 29 11:42:59 2012
+++ src/sys/arch/powerpc/conf/files.powerpc Tue Oct 2 19:51:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.powerpc,v 1.83 2012/03/29 15:42:59 matt Exp $
+# $NetBSD: files.powerpc,v 1.84 2012/10/02 23:51:39 christos Exp $
defflag opt_altivec.h ALTIVEC K_ALTIVEC PPC_HAVE_SPE
defflag opt_openpic.h OPENPIC OPENPIC_SERIAL_MODE OPENPIC_DISTRIBUTE
@@ -67,9 +67,9 @@ file arch/powerpc/booke/copyout.c ppc_
file arch/powerpc/booke/kcopy.c ppc_booke
file arch/powerpc/booke/spe.c ppc_booke
file arch/powerpc/booke/trap.c ppc_booke
-file common/pmap/tlb/pmap.c ppc_booke
-file common/pmap/tlb/pmap_segtab.c ppc_booke
-file common/pmap/tlb/pmap_tlb.c ppc_booke
+file uvm/pmap/pmap.c ppc_booke
+file uvm/pmap/pmap_segtab.c ppc_booke
+file uvm/pmap/pmap_tlb.c ppc_booke
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
file arch/powerpc/powerpc/compat_13_machdep.c compat_13
Index: src/sys/arch/powerpc/include/booke/cpuvar.h
diff -u src/sys/arch/powerpc/include/booke/cpuvar.h:1.16 src/sys/arch/powerpc/include/booke/cpuvar.h:1.17
--- src/sys/arch/powerpc/include/booke/cpuvar.h:1.16 Wed Aug 1 17:30:24 2012
+++ src/sys/arch/powerpc/include/booke/cpuvar.h Tue Oct 2 19:51:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.16 2012/08/01 21:30:24 matt Exp $ */
+/* $NetBSD: cpuvar.h,v 1.17 2012/10/02 23:51:39 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -109,7 +109,7 @@ struct generic_attach_args {
typedef __BSD_PT_ENTRY_T pt_entry_t;
#endif
-#include <common/pmap/tlb/tlb.h>
+#include <uvm/pmap/tlb.h>
struct tlb_md_io_ops {
/*
Index: src/sys/arch/powerpc/include/booke/pmap.h
diff -u src/sys/arch/powerpc/include/booke/pmap.h:1.10 src/sys/arch/powerpc/include/booke/pmap.h:1.11
--- src/sys/arch/powerpc/include/booke/pmap.h:1.10 Mon Jul 9 13:48:31 2012
+++ src/sys/arch/powerpc/include/booke/pmap.h Tue Oct 2 19:51:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.10 2012/07/09 17:48:31 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.11 2012/10/02 23:51:39 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -58,7 +58,7 @@
#define PMAP_NEED_PROCWR
-#include <common/pmap/tlb/vmpagemd.h>
+#include <uvm/pmap/vmpagemd.h>
#include <powerpc/booke/pte.h>
@@ -144,6 +144,6 @@ pmap_md_tlb_asid_max(void)
#define POOL_VTOPHYS(va) ((paddr_t)(vaddr_t)(va))
#define POOL_PHYSTOV(pa) ((vaddr_t)(paddr_t)(pa))
-#include <common/pmap/tlb/pmap.h>
+#include <uvm/pmap/pmap.h>
#endif /* !_POWERPC_BOOKE_PMAP_H_ */
Index: src/sys/arch/powerpc/include/booke/vmparam.h
diff -u src/sys/arch/powerpc/include/booke/vmparam.h:1.6 src/sys/arch/powerpc/include/booke/vmparam.h:1.7
--- src/sys/arch/powerpc/include/booke/vmparam.h:1.6 Mon Jul 9 13:55:15 2012
+++ src/sys/arch/powerpc/include/booke/vmparam.h Tue Oct 2 19:51:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.6 2012/07/09 17:55:15 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.7 2012/10/02 23:51:39 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -106,6 +106,6 @@
#define VM_PHYS_SIZE (USRIOSIZE * PAGE_SIZE)
#endif
-#include <common/pmap/tlb/vmpagemd.h>
+#include <uvm/pmap/vmpagemd.h>
#endif /* _POWERPC_BOOKE_VMPARAM_H_ */
