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 Move struct pv_addr next to struc...
details: https://anonhg.NetBSD.org/src/rev/5bf0bbb2143e
branches: trunk
changeset: 781341:5bf0bbb2143e
user: martin <martin%NetBSD.org@localhost>
date: Sat Sep 01 12:05:09 2012 +0000
description:
Move struct pv_addr next to struct bootmem_info into machdep.h and have
pmap.h include that.
Seems to be the least intrusive build fix; Matt: feel free to revamp.
diffstat:
sys/arch/arm/include/arm32/machdep.h | 17 ++++++++++++++++-
sys/arch/arm/include/arm32/pmap.h | 18 ++----------------
2 files changed, 18 insertions(+), 17 deletions(-)
diffs (70 lines):
diff -r 77159289f686 -r 5bf0bbb2143e sys/arch/arm/include/arm32/machdep.h
--- a/sys/arch/arm/include/arm32/machdep.h Sat Sep 01 11:24:36 2012 +0000
+++ b/sys/arch/arm/include/arm32/machdep.h Sat Sep 01 12:05:09 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.14 2012/08/31 23:59:52 matt Exp $ */
+/* $NetBSD: machdep.h,v 1.15 2012/09/01 12:05:09 martin Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
@@ -30,6 +30,21 @@
// extern u_int undefined_handler_address;
#define undefined_handler_address (curcpu()->ci_undefsave[2])
+/*
+ * Physical / virtual address structure. In a number of places (particularly
+ * during bootstrapping) we need to keep track of the physical and virtual
+ * addresses of various pages
+ */
+typedef struct pv_addr {
+ SLIST_ENTRY(pv_addr) pv_list;
+ paddr_t pv_pa;
+ vaddr_t pv_va;
+ vsize_t pv_size;
+ uint8_t pv_cache;
+ uint8_t pv_prot;
+} pv_addr_t;
+typedef SLIST_HEAD(, pv_addr) pv_addrqh_t;
+
struct bootmem_info {
paddr_t bmi_start;
paddr_t bmi_kernelstart;
diff -r 77159289f686 -r 5bf0bbb2143e sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Sat Sep 01 11:24:36 2012 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Sat Sep 01 12:05:09 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.104 2012/08/30 02:10:15 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.105 2012/09/01 12:05:09 martin Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -72,6 +72,7 @@
#include <arm/cpuconf.h>
#include <arm/arm32/pte.h>
+#include <arm/arm32/machdep.h>
#ifndef _LOCORE
#if defined(_KERNEL_OPT)
#include "opt_arm32_pmap.h"
@@ -197,21 +198,6 @@
LIST_ENTRY(pmap) pm_list;
};
-/*
- * Physical / virtual address structure. In a number of places (particularly
- * during bootstrapping) we need to keep track of the physical and virtual
- * addresses of various pages
- */
-typedef struct pv_addr {
- SLIST_ENTRY(pv_addr) pv_list;
- paddr_t pv_pa;
- vaddr_t pv_va;
- vsize_t pv_size;
- uint8_t pv_cache;
- uint8_t pv_prot;
-} pv_addr_t;
-typedef SLIST_HEAD(, pv_addr) pv_addrqh_t;
-
extern pv_addrqh_t pmap_freeq;
extern pv_addr_t kernelstack;
extern pv_addr_t abtstack;
Home |
Main Index |
Thread Index |
Old Index