Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/include/arm32 Prevent double definition of pt_e...
details: https://anonhg.NetBSD.org/src/rev/17fcd4b1a79b
branches: trunk
changeset: 971787:17fcd4b1a79b
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 de07293a9f56 -r 17fcd4b1a79b 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 */
Home |
Main Index |
Thread Index |
Old Index