[src/trunk]: src/sys/uvm/pmap Multiple inclusion protection define consistency

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

details:   https://anonhg.NetBSD.org/src/rev/e9e1f154a82e
branches:  trunk
changeset: 354653:e9e1f154a82e
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jun 24 05:31:03 2017 +0000

description:
Multiple inclusion protection define consistency

diffstat:

 sys/uvm/pmap/pmap.h     |  8 ++++----
 sys/uvm/pmap/pmap_pvt.h |  8 ++++----
 sys/uvm/pmap/pmap_tlb.h |  8 ++++----
 sys/uvm/pmap/tlb.h      |  8 ++++----
 sys/uvm/pmap/vmpagemd.h |  8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diffs (130 lines):

diff -r f79041e1f5e1 -r e9e1f154a82e sys/uvm/pmap/pmap.h
--- a/sys/uvm/pmap/pmap.h       Fri Jun 23 23:40:00 2017 +0000
+++ b/sys/uvm/pmap/pmap.h       Sat Jun 24 05:31:03 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.7 2016/07/11 16:06:09 matt Exp $    */
+/*     $NetBSD: pmap.h,v 1.8 2017/06/24 05:31:03 skrll Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -71,8 +71,8 @@
  *     @(#)pmap.h      8.1 (Berkeley) 6/10/93
  */
 
-#ifndef        _COMMON_PMAP_H_
-#define        _COMMON_PMAP_H_
+#ifndef        _UVM_PMAP_PMAP_H_
+#define        _UVM_PMAP_PMAP_H_
 
 #include <uvm/uvm_stat.h>
 #ifdef UVMHIST
@@ -218,4 +218,4 @@
 EVCNT_ATTACH_STATIC(pmap_evcnt_##name)
 
 #endif /* _KERNEL */
-#endif /* _COMMON_PMAP_H_ */
+#endif /* _UVM_PMAP_PMAP_H_ */
diff -r f79041e1f5e1 -r e9e1f154a82e sys/uvm/pmap/pmap_pvt.h
--- a/sys/uvm/pmap/pmap_pvt.h   Fri Jun 23 23:40:00 2017 +0000
+++ b/sys/uvm/pmap/pmap_pvt.h   Sat Jun 24 05:31:03 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_pvt.h,v 1.1 2015/11/11 08:20:22 skrll Exp $       */
+/*     $NetBSD: pmap_pvt.h,v 1.2 2017/06/24 05:31:03 skrll Exp $       */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef _COMMON_PMAP_PV_H_
-#define _COMMON_PMAP_PV_H_
+#ifndef        _UVM_PMAP_PMAP_PVT_H_
+#define        _UVM_PMAP_PMAP_PVT_H_
 
 #include <sys/pserialize.h>
 
@@ -44,4 +44,4 @@
 
 struct pmap_page *pmap_pv_tracked(paddr_t);
 
-#endif  /* _COMMON_PMAP_PV_H_ */
+#endif /* _UVM_PMAP_PMAP_PVT_H_ */
diff -r f79041e1f5e1 -r e9e1f154a82e sys/uvm/pmap/pmap_tlb.h
--- a/sys/uvm/pmap/pmap_tlb.h   Fri Jun 23 23:40:00 2017 +0000
+++ b/sys/uvm/pmap/pmap_tlb.h   Sat Jun 24 05:31:03 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_tlb.h,v 1.10 2017/05/26 06:41:42 skrll Exp $      */
+/*     $NetBSD: pmap_tlb.h,v 1.11 2017/06/24 05:31:03 skrll Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -71,8 +71,8 @@
  *     @(#)pmap.h      8.1 (Berkeley) 6/10/93
  */
 
-#ifndef        _COMMON_PMAP_TLB_H_
-#define        _COMMON_PMAP_TLB_H_
+#ifndef        _UVM_PMAP_PMAP_TLB_H_
+#define        _UVM_PMAP_PMAP_TLB_H_
 
 #include <sys/evcnt.h>
 #include <sys/kcpuset.h>
@@ -179,4 +179,4 @@
 void   pmap_tlb_asid_check(void);
 
 #endif /* _KERNEL */
-#endif /* _COMMON_PMAP_TLB_H_ */
+#endif /* _UVM_PMAP_PMAP_TLB_H_ */
diff -r f79041e1f5e1 -r e9e1f154a82e sys/uvm/pmap/tlb.h
--- a/sys/uvm/pmap/tlb.h        Fri Jun 23 23:40:00 2017 +0000
+++ b/sys/uvm/pmap/tlb.h        Sat Jun 24 05:31:03 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tlb.h,v 1.3 2016/07/11 16:06:09 matt Exp $     */
+/*     $NetBSD: tlb.h,v 1.4 2017/06/24 05:31:03 skrll Exp $    */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,8 +27,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef _UVM_PMAP_PMAP_TLB_TLB_H_
-#define        _UVM_PMAP_PMAP_TLB_TLB_H_
+#ifndef        _UVM_PMAP_TLB_H_
+#define        _UVM_PMAP_TLB_H_
 
 #if defined(_KERNEL) || defined(_KMEMUSER)
 
@@ -69,4 +69,4 @@
 
 #endif /* _KERNEL || _KMEMUSER */
 
-#endif /* !_UVM_PMAP_PMAP_TLB_TLB_H_ */
+#endif /* _UVM_PMAP_TLB_H_ */
diff -r f79041e1f5e1 -r e9e1f154a82e sys/uvm/pmap/vmpagemd.h
--- a/sys/uvm/pmap/vmpagemd.h   Fri Jun 23 23:40:00 2017 +0000
+++ b/sys/uvm/pmap/vmpagemd.h   Sat Jun 24 05:31:03 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmpagemd.h,v 1.4 2017/06/07 07:06:26 skrll Exp $       */
+/*     $NetBSD: vmpagemd.h,v 1.5 2017/06/24 05:31:03 skrll Exp $       */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _COMMON_PMAP_TLB_VMPAGEMD_H_
-#define _COMMON_PMAP_TLB_VMPAGEMD_H_
+#ifndef _UVM_PMAP_VMPAGEMD_H_
+#define _UVM_PMAP_VMPAGEMD_H_
 
 #ifdef _LOCORE
 #error use assym.h instead
@@ -158,4 +158,4 @@
 
 #endif /* _MODULE */
 
-#endif /* __COMMON_PMAP_TLB_VMPAGEMD_H_ */
+#endif /* _UVM_PMAP_VMPAGEMD_H_ */