Module Name: src
Committed By: skrll
Date: Sat Jun 24 05:31:03 UTC 2017
Modified Files:
src/sys/uvm/pmap: pmap.h pmap_pvt.h pmap_tlb.h tlb.h vmpagemd.h
Log Message:
Multiple inclusion protection define consistency
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/uvm/pmap/pmap.h
cvs rdiff -u -r1.1 -r1.2 src/sys/uvm/pmap/pmap_pvt.h
cvs rdiff -u -r1.10 -r1.11 src/sys/uvm/pmap/pmap_tlb.h
cvs rdiff -u -r1.3 -r1.4 src/sys/uvm/pmap/tlb.h
cvs rdiff -u -r1.4 -r1.5 src/sys/uvm/pmap/vmpagemd.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/uvm/pmap/pmap.h
diff -u src/sys/uvm/pmap/pmap.h:1.7 src/sys/uvm/pmap/pmap.h:1.8
--- src/sys/uvm/pmap/pmap.h:1.7 Mon Jul 11 16:06:09 2016
+++ src/sys/uvm/pmap/pmap.h Sat Jun 24 05:31:03 2017
@@ -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 @@ struct evcnt pmap_evcnt_##name = \
EVCNT_ATTACH_STATIC(pmap_evcnt_##name)
#endif /* _KERNEL */
-#endif /* _COMMON_PMAP_H_ */
+#endif /* _UVM_PMAP_PMAP_H_ */
Index: src/sys/uvm/pmap/pmap_pvt.h
diff -u src/sys/uvm/pmap/pmap_pvt.h:1.1 src/sys/uvm/pmap/pmap_pvt.h:1.2
--- src/sys/uvm/pmap/pmap_pvt.h:1.1 Wed Nov 11 08:20:22 2015
+++ src/sys/uvm/pmap/pmap_pvt.h Sat Jun 24 05:31:03 2017
@@ -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 @@ void pmap_pv_untrack(paddr_t, psize_t);
struct pmap_page *pmap_pv_tracked(paddr_t);
-#endif /* _COMMON_PMAP_PV_H_ */
+#endif /* _UVM_PMAP_PMAP_PVT_H_ */
Index: src/sys/uvm/pmap/pmap_tlb.h
diff -u src/sys/uvm/pmap/pmap_tlb.h:1.10 src/sys/uvm/pmap/pmap_tlb.h:1.11
--- src/sys/uvm/pmap/pmap_tlb.h:1.10 Fri May 26 06:41:42 2017
+++ src/sys/uvm/pmap/pmap_tlb.h Sat Jun 24 05:31:03 2017
@@ -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_check(pmap_t, bool (*)(voi
void pmap_tlb_asid_check(void);
#endif /* _KERNEL */
-#endif /* _COMMON_PMAP_TLB_H_ */
+#endif /* _UVM_PMAP_PMAP_TLB_H_ */
Index: src/sys/uvm/pmap/tlb.h
diff -u src/sys/uvm/pmap/tlb.h:1.3 src/sys/uvm/pmap/tlb.h:1.4
--- src/sys/uvm/pmap/tlb.h:1.3 Mon Jul 11 16:06:09 2016
+++ src/sys/uvm/pmap/tlb.h Sat Jun 24 05:31:03 2017
@@ -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 @@ void tlb_dump(void (*)(const char *, ...
#endif /* _KERNEL || _KMEMUSER */
-#endif /* !_UVM_PMAP_PMAP_TLB_TLB_H_ */
+#endif /* _UVM_PMAP_TLB_H_ */
Index: src/sys/uvm/pmap/vmpagemd.h
diff -u src/sys/uvm/pmap/vmpagemd.h:1.4 src/sys/uvm/pmap/vmpagemd.h:1.5
--- src/sys/uvm/pmap/vmpagemd.h:1.4 Wed Jun 7 07:06:26 2017
+++ src/sys/uvm/pmap/vmpagemd.h Sat Jun 24 05:31:03 2017
@@ -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 @@ do { \
#endif /* _MODULE */
-#endif /* __COMMON_PMAP_TLB_VMPAGEMD_H_ */
+#endif /* _UVM_PMAP_VMPAGEMD_H_ */
