Module Name: src
Committed By: matt
Date: Thu Feb 17 13:55:45 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke: booke_pmap.c
src/sys/arch/powerpc/include/booke: pmap.h
src/sys/common/pmap/tlb: pmap_tlb.c
Log Message:
Use _PMAP_PRIVATE to control the inclusion of <powerpc/booke/cpuvar.h>.
This prevents most of the MI files from depending on it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/include/booke/pmap.h
cvs rdiff -u -r1.2 -r1.3 src/sys/common/pmap/tlb/pmap_tlb.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/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.2 src/sys/arch/powerpc/booke/booke_pmap.c:1.3
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.2 Tue Jan 18 01:02:52 2011
+++ src/sys/arch/powerpc/booke/booke_pmap.c Thu Feb 17 13:55:44 2011
@@ -33,9 +33,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#define _PMAP_PRIVATE
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.2 2011/01/18 01:02:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.3 2011/02/17 13:55:44 matt Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
Index: src/sys/arch/powerpc/include/booke/pmap.h
diff -u src/sys/arch/powerpc/include/booke/pmap.h:1.3 src/sys/arch/powerpc/include/booke/pmap.h:1.4
--- src/sys/arch/powerpc/include/booke/pmap.h:1.3 Tue Feb 8 01:39:36 2011
+++ src/sys/arch/powerpc/include/booke/pmap.h Thu Feb 17 13:55:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.3 2011/02/08 01:39:36 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.4 2011/02/17 13:55:45 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -43,7 +43,9 @@
#include <sys/cpu.h>
#include <sys/kcore.h>
#include <uvm/uvm_page.h>
+#ifdef _PMAP_PRIVATE
#include <powerpc/booke/cpuvar.h>
+#endif
#define PMAP_MD_NOCACHE 0x01000000
#define PMAP_NEED_PROCWR
Index: src/sys/common/pmap/tlb/pmap_tlb.c
diff -u src/sys/common/pmap/tlb/pmap_tlb.c:1.2 src/sys/common/pmap/tlb/pmap_tlb.c:1.3
--- src/sys/common/pmap/tlb/pmap_tlb.c:1.2 Tue Jan 18 01:11:50 2011
+++ src/sys/common/pmap/tlb/pmap_tlb.c Thu Feb 17 13:55:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_tlb.c,v 1.2 2011/01/18 01:11:50 matt Exp $ */
+/* $NetBSD: pmap_tlb.c,v 1.3 2011/02/17 13:55:45 matt Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.2 2011/01/18 01:11:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.3 2011/02/17 13:55:45 matt Exp $");
/*
* Manages address spaces in a TLB.
@@ -122,6 +122,8 @@
* a lot of overhead for not much gain.
*/
+#define _PMAP_PRIVATE
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
