Module Name: src
Committed By: martin
Date: Sat Sep 1 12:19:32 UTC 2012
Modified Files:
src/sys/arch/arm/include/arm32: machdep.h pmap.h
Log Message:
Backout previous, Matt fixed it differently
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/arm32/machdep.h
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/include/arm32/pmap.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/machdep.h
diff -u src/sys/arch/arm/include/arm32/machdep.h:1.15 src/sys/arch/arm/include/arm32/machdep.h:1.16
--- src/sys/arch/arm/include/arm32/machdep.h:1.15 Sat Sep 1 12:05:09 2012
+++ src/sys/arch/arm/include/arm32/machdep.h Sat Sep 1 12:19:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.15 2012/09/01 12:05:09 martin Exp $ */
+/* $NetBSD: machdep.h,v 1.16 2012/09/01 12:19:32 martin Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
@@ -30,21 +30,6 @@ extern u_int prefetch_abort_handler_addr
// 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;
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.105 src/sys/arch/arm/include/arm32/pmap.h:1.106
--- src/sys/arch/arm/include/arm32/pmap.h:1.105 Sat Sep 1 12:05:09 2012
+++ src/sys/arch/arm/include/arm32/pmap.h Sat Sep 1 12:19:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.105 2012/09/01 12:05:09 martin Exp $ */
+/* $NetBSD: pmap.h,v 1.106 2012/09/01 12:19:32 martin Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -72,7 +72,6 @@
#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"
@@ -198,6 +197,21 @@ struct pmap {
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;
