Module Name: src
Committed By: joerg
Date: Mon May 4 18:36:24 UTC 2020
Modified Files:
src/sys/arch/arm/include/arm32: pte.h
Log Message:
Prevent double definition of pt_entry_t from machine/param.h
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/include/arm32/pte.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/arch/arm/include/arm32/pte.h
diff -u src/sys/arch/arm/include/arm32/pte.h:1.22 src/sys/arch/arm/include/arm32/pte.h:1.23
--- src/sys/arch/arm/include/arm32/pte.h:1.22 Sun Feb 2 09:19:48 2020
+++ src/sys/arch/arm/include/arm32/pte.h Mon May 4 18:36:24 2020
@@ -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 */
