[src/trunk]: src/sys/arch Fix some more uvm header fallout. Add include guar...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Fix some more uvm header fallout. Add include guar...
From: riastradh <riastradh%NetBSD.org@localhost>
Date: Sun, 15 Nov 2020 15:04:09 +0000

details:   https://anonhg.NetBSD.org/src/rev/7aa64699aa3d
branches:  trunk
changeset: 943577:7aa64699aa3d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 06 17:19:46 2020 +0000

description:
Fix some more uvm header fallout.  Add include guards while here.

diffstat:

 sys/arch/dreamcast/include/kloader.h    |  13 ++++++++++++-
 sys/arch/evbsh3/include/kloader.h       |   8 +++++++-
 sys/arch/hpcarm/include/kloader.h       |   5 ++++-
 sys/arch/hpcmips/include/kloader.h      |   8 +++++++-
 sys/arch/hpcsh/include/kloader.h        |  13 ++++++++++++-
 sys/arch/landisk/include/kloader.h      |   8 +++++++-
 sys/arch/playstation2/include/kloader.h |  12 +++++++++++-
 7 files changed, 60 insertions(+), 7 deletions(-)

diffs (183 lines):

diff -r 0fa14e9270b5 -r 7aa64699aa3d sys/arch/dreamcast/include/kloader.h
--- a/sys/arch/dreamcast/include/kloader.h      Sun Sep 06 17:15:09 2020 +0000
+++ b/sys/arch/dreamcast/include/kloader.h      Sun Sep 06 17:19:46 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.h,v 1.5 2015/06/11 15:08:27 matt Exp $ */
+/* $NetBSD: kloader.h,v 1.6 2020/09/06 17:19:46 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -26,8 +26,19 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef        _DREAMCAST_KLOADER_H_
+#define        _DREAMCAST_KLOADER_H_
+
+#include <sys/types.h>
+
+#include <uvm/uvm_page.h>
+
+#include <machine/cpu.h>
+
 /* Dreamcast port don't have bootinfo */
 #define        KLOADER_NO_BOOTINFO
 #define PG_VADDR(pg)   SH3_PHYS_TO_P1SEG(VM_PAGE_TO_PHYS(pg))
 #include <dev/kloader.h>
 extern paddr_t avail_start, avail_end;
+
+#endif /* _DREAMCAST_KLOADER_H_ */
diff -r 0fa14e9270b5 -r 7aa64699aa3d sys/arch/evbsh3/include/kloader.h
--- a/sys/arch/evbsh3/include/kloader.h Sun Sep 06 17:15:09 2020 +0000
+++ b/sys/arch/evbsh3/include/kloader.h Sun Sep 06 17:19:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kloader.h,v 1.2 2015/06/11 15:11:13 matt Exp $ */
+/*     $NetBSD: kloader.h,v 1.3 2020/09/06 17:19:46 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -29,6 +29,12 @@
 #ifndef        _EVBSH3_KLOADER_H_
 #define        _EVBSH3_KLOADER_H_
 
+#include <sys/types.h>
+
+#include <uvm/uvm_page.h>
+
+#include <machine/cpu.h>
+
 #define PG_VADDR(pg)   SH3_PHYS_TO_P1SEG(VM_PAGE_TO_PHYS(pg))
 
 #define        KLOADER_NO_BOOTINFO
diff -r 0fa14e9270b5 -r 7aa64699aa3d sys/arch/hpcarm/include/kloader.h
--- a/sys/arch/hpcarm/include/kloader.h Sun Sep 06 17:15:09 2020 +0000
+++ b/sys/arch/hpcarm/include/kloader.h Sun Sep 06 17:19:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kloader.h,v 1.3 2019/12/15 16:48:25 tsutsui Exp $      */
+/*     $NetBSD: kloader.h,v 1.4 2020/09/06 17:19:46 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -29,9 +29,12 @@
 #ifndef        _HPCARM_KLOADER_H_
 #define        _HPCARM_KLOADER_H_
 
+#include <sys/types.h>
+
 #include <sys/lock.h>
 
 #include <uvm/uvm_extern.h>
+#include <uvm/uvm_page.h>
 
 #define PG_VADDR(pg)   kloader_phystov(VM_PAGE_TO_PHYS(pg))
 vaddr_t kloader_phystov(paddr_t pa);
diff -r 0fa14e9270b5 -r 7aa64699aa3d sys/arch/hpcmips/include/kloader.h
--- a/sys/arch/hpcmips/include/kloader.h        Sun Sep 06 17:15:09 2020 +0000
+++ b/sys/arch/hpcmips/include/kloader.h        Sun Sep 06 17:19:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kloader.h,v 1.6 2015/06/11 08:22:09 matt Exp $ */
+/*     $NetBSD: kloader.h,v 1.7 2020/09/06 17:19:46 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -26,9 +26,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef        _HPCMIPS_KLOADER_H_
+#define        _HPCMIPS_KLOADER_H_
+
 #include <dev/kloader.h>
 
 #include <uvm/uvm_extern.h>
+#include <uvm/uvm_page.h>
 
 #include <mips/cpuregs.h>
 
@@ -37,3 +41,5 @@
 /* XXX: kludge: MI kloader.c assumes avail_start and avail_end are common */
 #define avail_start    pmap_limits.avail_start
 #define avail_end      pmap_limits.avail_end
+
+#endif /* _HPCMIPS_KLOADER_H_ */
diff -r 0fa14e9270b5 -r 7aa64699aa3d sys/arch/hpcsh/include/kloader.h
--- a/sys/arch/hpcsh/include/kloader.h  Sun Sep 06 17:15:09 2020 +0000
+++ b/sys/arch/hpcsh/include/kloader.h  Sun Sep 06 17:19:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kloader.h,v 1.5 2015/06/11 08:14:38 matt Exp $ */
+/*     $NetBSD: kloader.h,v 1.6 2020/09/06 17:19:46 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -26,8 +26,19 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef        _HPCSH_KLOADER_H_
+#define        _HPCSH_KLOADER_H_
+
+#include <sys/types.h>
+
+#include <uvm/uvm_page.h>
+
+#include <machine/cpu.h>
+
 #include <dev/kloader.h>
 
 #define PG_VADDR(pg)   SH3_PHYS_TO_P1SEG(VM_PAGE_TO_PHYS(pg))
 
 extern paddr_t avail_start, avail_end;
+
+#endif /* _HPCSH_KLOADER_H_ */
diff -r 0fa14e9270b5 -r 7aa64699aa3d sys/arch/landisk/include/kloader.h
--- a/sys/arch/landisk/include/kloader.h        Sun Sep 06 17:15:09 2020 +0000
+++ b/sys/arch/landisk/include/kloader.h        Sun Sep 06 17:19:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kloader.h,v 1.3 2015/06/11 15:11:14 matt Exp $ */
+/*     $NetBSD: kloader.h,v 1.4 2020/09/06 17:19:47 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -29,6 +29,12 @@
 #ifndef        _LANDISK_KLOADER_H_
 #define        _LANDISK_KLOADER_H_
 
+#include <sys/types.h>
+
+#include <uvm/uvm_page.h>
+
+#include <machine/cpu.h>
+
 #define PG_VADDR(pg)   SH3_PHYS_TO_P1SEG(VM_PAGE_TO_PHYS(pg))
 extern paddr_t avail_start, avail_end;
 
diff -r 0fa14e9270b5 -r 7aa64699aa3d sys/arch/playstation2/include/kloader.h
--- a/sys/arch/playstation2/include/kloader.h   Sun Sep 06 17:15:09 2020 +0000
+++ b/sys/arch/playstation2/include/kloader.h   Sun Sep 06 17:19:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kloader.h,v 1.6 2015/06/11 15:11:14 matt Exp $ */
+/*     $NetBSD: kloader.h,v 1.7 2020/09/06 17:19:47 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -26,6 +26,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef        _PLAYSTATION2_KLOADER_H_
+#define        _PLAYSTATION2_KLOADER_H_
+
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_page.h>
+
+#include <mips/cpuregs.h>
+
 /* Playstaion 2 port kloader don't need bootinfo */
 #define        KLOADER_NO_BOOTINFO
 #define PG_VADDR(pg)   MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(pg))
@@ -34,3 +42,5 @@
 /* XXX: kludge: MI kloader.c assumes avail_start and avail_end are common */
 #define avail_start    pmap_limits.avail_start
 #define avail_end      pmap_limits.avail_end
+
+#endif /* _PLAYSTATION2_KLOADER_H_ */

Prev by Date: [src/trunk]: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common comment...
Next by Date: [src/trunk]: src/sys/dev/sbus uvm/uvm_extern.h, not machine/pmap.h, for pmap(...
Previous by Thread: [src/trunk]: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common comment...
Next by Thread: [src/trunk]: src/sys/dev/sbus uvm/uvm_extern.h, not machine/pmap.h, for pmap(...
Indexes:

Home | Main Index | Thread Index | Old Index