[src/trunk]: src/sys Use _PMAP_PRIVATE to control the inclusion of <powerpc/b...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8f3850c224fc
branches:  trunk
changeset: 762199:8f3850c224fc
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Feb 17 13:55:44 2011 +0000

description:
Use _PMAP_PRIVATE to control the inclusion of <powerpc/booke/cpuvar.h>.
This prevents most of the MI files from depending on it.

diffstat:

 sys/arch/powerpc/booke/booke_pmap.c   |  4 +++-
 sys/arch/powerpc/include/booke/pmap.h |  4 +++-
 sys/common/pmap/tlb/pmap_tlb.c        |  6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 969149a623ee -r 8f3850c224fc sys/arch/powerpc/booke/booke_pmap.c
--- a/sys/arch/powerpc/booke/booke_pmap.c       Thu Feb 17 13:53:32 2011 +0000
+++ b/sys/arch/powerpc/booke/booke_pmap.c       Thu Feb 17 13:55:44 2011 +0000
@@ -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>
diff -r 969149a623ee -r 8f3850c224fc sys/arch/powerpc/include/booke/pmap.h
--- a/sys/arch/powerpc/include/booke/pmap.h     Thu Feb 17 13:53:32 2011 +0000
+++ b/sys/arch/powerpc/include/booke/pmap.h     Thu Feb 17 13:55:44 2011 +0000
@@ -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
diff -r 969149a623ee -r 8f3850c224fc sys/common/pmap/tlb/pmap_tlb.c
--- a/sys/common/pmap/tlb/pmap_tlb.c    Thu Feb 17 13:53:32 2011 +0000
+++ b/sys/common/pmap/tlb/pmap_tlb.c    Thu Feb 17 13:55:44 2011 +0000
@@ -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>