Module Name: src
Committed By: riastradh
Date: Sun Sep 6 17:19:47 UTC 2020
Modified Files:
src/sys/arch/dreamcast/include: kloader.h
src/sys/arch/evbsh3/include: kloader.h
src/sys/arch/hpcarm/include: kloader.h
src/sys/arch/hpcmips/include: kloader.h
src/sys/arch/hpcsh/include: kloader.h
src/sys/arch/landisk/include: kloader.h
src/sys/arch/playstation2/include: kloader.h
Log Message:
Fix some more uvm header fallout. Add include guards while here.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/dreamcast/include/kloader.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbsh3/include/kloader.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcarm/include/kloader.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/include/kloader.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcsh/include/kloader.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/include/kloader.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/playstation2/include/kloader.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/dreamcast/include/kloader.h
diff -u src/sys/arch/dreamcast/include/kloader.h:1.5 src/sys/arch/dreamcast/include/kloader.h:1.6
--- src/sys/arch/dreamcast/include/kloader.h:1.5 Thu Jun 11 15:08:27 2015
+++ src/sys/arch/dreamcast/include/kloader.h Sun Sep 6 17:19:46 2020
@@ -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_ */
Index: src/sys/arch/evbsh3/include/kloader.h
diff -u src/sys/arch/evbsh3/include/kloader.h:1.2 src/sys/arch/evbsh3/include/kloader.h:1.3
--- src/sys/arch/evbsh3/include/kloader.h:1.2 Thu Jun 11 15:11:13 2015
+++ src/sys/arch/evbsh3/include/kloader.h Sun Sep 6 17:19:46 2020
@@ -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
Index: src/sys/arch/hpcarm/include/kloader.h
diff -u src/sys/arch/hpcarm/include/kloader.h:1.3 src/sys/arch/hpcarm/include/kloader.h:1.4
--- src/sys/arch/hpcarm/include/kloader.h:1.3 Sun Dec 15 16:48:25 2019
+++ src/sys/arch/hpcarm/include/kloader.h Sun Sep 6 17:19:46 2020
@@ -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);
Index: src/sys/arch/hpcmips/include/kloader.h
diff -u src/sys/arch/hpcmips/include/kloader.h:1.6 src/sys/arch/hpcmips/include/kloader.h:1.7
--- src/sys/arch/hpcmips/include/kloader.h:1.6 Thu Jun 11 08:22:09 2015
+++ src/sys/arch/hpcmips/include/kloader.h Sun Sep 6 17:19:46 2020
@@ -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_ */
Index: src/sys/arch/hpcsh/include/kloader.h
diff -u src/sys/arch/hpcsh/include/kloader.h:1.5 src/sys/arch/hpcsh/include/kloader.h:1.6
--- src/sys/arch/hpcsh/include/kloader.h:1.5 Thu Jun 11 08:14:38 2015
+++ src/sys/arch/hpcsh/include/kloader.h Sun Sep 6 17:19:46 2020
@@ -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_ */
Index: src/sys/arch/landisk/include/kloader.h
diff -u src/sys/arch/landisk/include/kloader.h:1.3 src/sys/arch/landisk/include/kloader.h:1.4
--- src/sys/arch/landisk/include/kloader.h:1.3 Thu Jun 11 15:11:14 2015
+++ src/sys/arch/landisk/include/kloader.h Sun Sep 6 17:19:47 2020
@@ -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;
Index: src/sys/arch/playstation2/include/kloader.h
diff -u src/sys/arch/playstation2/include/kloader.h:1.6 src/sys/arch/playstation2/include/kloader.h:1.7
--- src/sys/arch/playstation2/include/kloader.h:1.6 Thu Jun 11 15:11:14 2015
+++ src/sys/arch/playstation2/include/kloader.h Sun Sep 6 17:19:47 2020
@@ -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_ */
