[src/trunk]: src/sys/arch/arm/include/arm32 Prevent double definition of pt_e...

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

details:   https://anonhg.NetBSD.org/src/rev/b4def440814b
branches:  trunk
changeset: 932305:b4def440814b
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon May 04 18:36:24 2020 +0000

description:
Prevent double definition of pt_entry_t from machine/param.h

diffstat:

 sys/arch/arm/include/arm32/pte.h |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r bcf11af1bf41 -r b4def440814b sys/arch/arm/include/arm32/pte.h
--- a/sys/arch/arm/include/arm32/pte.h  Mon May 04 18:23:37 2020 +0000
+++ b/sys/arch/arm/include/arm32/pte.h  Mon May 04 18:36:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pte.h,v 1.22 2020/02/02 09:19:48 skrll Exp $   */
+/*     $NetBSD: pte.h,v 1.23 2020/05/04 18:36:24 joerg Exp $   */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -89,7 +89,11 @@
 
 #ifndef _LOCORE
 typedef uint32_t       pd_entry_t;     /* L1 table entry */
-typedef uint32_t       pt_entry_t;     /* L2 table entry */
+#ifndef        __BSD_PTENTRY_T__
+#define        __BSD_PTENTRY_T__
+typedef uint32_t pt_entry_t;
+#define PRIxPTE                PRIx32
+#endif
 #endif /* _LOCORE */
 
 #define        L1_SS_SIZE      0x01000000      /* 16M */