[src/trunk]: src/sys/arch/arm/include/arm32 Backout previous, Matt fixed it d...

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

details:   https://anonhg.NetBSD.org/src/rev/23048a8f01a7
branches:  trunk
changeset: 781344:23048a8f01a7
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Sep 01 12:19:32 2012 +0000

description:
Backout previous, Matt fixed it differently

diffstat:

 sys/arch/arm/include/arm32/machdep.h |  17 +----------------
 sys/arch/arm/include/arm32/pmap.h    |  18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 18 deletions(-)

diffs (70 lines):

diff -r f2d870a3c3f0 -r 23048a8f01a7 sys/arch/arm/include/arm32/machdep.h
--- a/sys/arch/arm/include/arm32/machdep.h      Sat Sep 01 12:17:04 2012 +0000
+++ b/sys/arch/arm/include/arm32/machdep.h      Sat Sep 01 12:19:32 2012 +0000
@@ -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 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 f2d870a3c3f0 -r 23048a8f01a7 sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Sat Sep 01 12:17:04 2012 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Sat Sep 01 12:19:32 2012 +0000
@@ -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 @@
        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;