Module Name: src
Committed By: christos
Date: Wed Mar 27 17:15:30 UTC 2019
Modified Files:
src/sys/arch/acorn32/include: vmparam.h
src/sys/arch/amiga/include: vmparam.h
src/sys/arch/arm/include/arm32: vmparam.h
src/sys/arch/atari/include: vmparam.h
src/sys/arch/cats/include: vmparam.h
src/sys/arch/epoc32/include: vmparam.h
src/sys/arch/evbarm/include: vmparam.h
src/sys/arch/hpcarm/include: vmparam.h
src/sys/arch/iyonix/include: vmparam.h
src/sys/arch/shark/include: vmparam.h
src/sys/arch/zaurus/include: vmparam.h
Log Message:
- expose vmparams to userland on arm, like other archs do.
- remove unneeded includes
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn32/include/vmparam.h
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/include/vmparam.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/include/arm32/vmparam.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/atari/include/vmparam.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/cats/include/vmparam.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/include/vmparam.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/include/vmparam.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hpcarm/include/vmparam.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/iyonix/include/vmparam.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/shark/include/vmparam.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/include/vmparam.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/acorn32/include/vmparam.h
diff -u src/sys/arch/acorn32/include/vmparam.h:1.27 src/sys/arch/acorn32/include/vmparam.h:1.28
--- src/sys/arch/acorn32/include/vmparam.h:1.27 Thu Nov 2 05:42:44 2017
+++ src/sys/arch/acorn32/include/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.27 2017/11/02 09:42:44 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.28 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,8 +32,6 @@
#ifndef _ACORN32_VMPARAM_H_
#define _ACORN32_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
#include <arm/arm32/vmparam.h>
/*
@@ -83,6 +81,4 @@
#define VM_FREELIST_ISADMA 1
#define VM_FREELIST_RPCDMA 1
-#endif /* _KERNEL || _KMEMUSER */
-
#endif /* _ACORN32_VMPARAM_H_ */
Index: src/sys/arch/amiga/include/vmparam.h
diff -u src/sys/arch/amiga/include/vmparam.h:1.46 src/sys/arch/amiga/include/vmparam.h:1.47
--- src/sys/arch/amiga/include/vmparam.h:1.46 Wed Sep 30 16:36:28 2015
+++ src/sys/arch/amiga/include/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.46 2015/09/30 20:36:28 phx Exp $ */
+/* $NetBSD: vmparam.h,v 1.47 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,8 +41,6 @@
#ifndef _MACHINE_VMPARAM_H_
#define _MACHINE_VMPARAM_H_
-#include <machine/pte.h>
-
/*
* Machine dependent constants for amiga
*/
Index: src/sys/arch/arm/include/arm32/vmparam.h
diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.42 src/sys/arch/arm/include/arm32/vmparam.h:1.43
--- src/sys/arch/arm/include/arm32/vmparam.h:1.42 Sat Oct 27 09:26:23 2018
+++ src/sys/arch/arm/include/arm32/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.42 2018/10/27 13:26:23 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.43 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -38,7 +38,6 @@
#ifndef _ARM_ARM32_VMPARAM_H_
#define _ARM_ARM32_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
/*
* Virtual Memory parameters common to all arm32 platforms.
@@ -46,7 +45,6 @@
#include <arm/cpuconf.h>
#include <arm/arm32/param.h>
-#include <arm/arm32/pte.h> /* pt_entry_t */
#define __USE_TOPDOWN_VM
#define USRSTACK VM_MAXUSER_ADDRESS
@@ -99,6 +97,4 @@
#define VM_MIN_KERNEL_ADDRESS ((vaddr_t) KERNEL_BASE)
#define VM_MAX_KERNEL_ADDRESS ((vaddr_t) -(PAGE_SIZE+1))
-#endif /* _KERNEL || _KMEMUSER */
-
#endif /* _ARM_ARM32_VMPARAM_H_ */
Index: src/sys/arch/atari/include/vmparam.h
diff -u src/sys/arch/atari/include/vmparam.h:1.32 src/sys/arch/atari/include/vmparam.h:1.33
--- src/sys/arch/atari/include/vmparam.h:1.32 Mon Feb 26 10:11:12 2018
+++ src/sys/arch/atari/include/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.32 2018/02/26 15:11:12 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.33 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,8 +41,6 @@
#ifndef _MACHINE_VMPARAM_H_
#define _MACHINE_VMPARAM_H_
-#include <machine/pte.h>
-
/*
* Machine dependent constants for atari
*/
Index: src/sys/arch/cats/include/vmparam.h
diff -u src/sys/arch/cats/include/vmparam.h:1.30 src/sys/arch/cats/include/vmparam.h:1.31
--- src/sys/arch/cats/include/vmparam.h:1.30 Thu Nov 2 05:42:44 2017
+++ src/sys/arch/cats/include/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.30 2017/11/02 09:42:44 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.31 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,8 +32,6 @@
#ifndef _CATS_VMPARAM_H_
#define _CATS_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
#include <arm/arm32/vmparam.h>
/*
@@ -81,6 +79,4 @@
#define VM_FREELIST_DEFAULT 0
#define VM_FREELIST_ISADMA 1
-#endif /* _KERNEL || _KMEMUSER */
-
#endif /* _CATS_VMPARAM_H_ */
Index: src/sys/arch/epoc32/include/vmparam.h
diff -u src/sys/arch/epoc32/include/vmparam.h:1.3 src/sys/arch/epoc32/include/vmparam.h:1.4
--- src/sys/arch/epoc32/include/vmparam.h:1.3 Mon Feb 23 15:34:38 2015
+++ src/sys/arch/epoc32/include/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.3 2015/02/23 20:34:38 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.4 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,8 +32,6 @@
#ifndef _EPOC32_VMPARAM_H_
#define _EPOC32_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
#include <arm/arm32/vmparam.h>
/*
@@ -79,6 +77,4 @@
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
-#endif /* _KERNEL || _KMEMUSER */
-
#endif /* _EPOC32_VMPARAM_H_ */
Index: src/sys/arch/evbarm/include/vmparam.h
diff -u src/sys/arch/evbarm/include/vmparam.h:1.32 src/sys/arch/evbarm/include/vmparam.h:1.33
--- src/sys/arch/evbarm/include/vmparam.h:1.32 Sun Apr 1 00:35:05 2018
+++ src/sys/arch/evbarm/include/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.32 2018/04/01 04:35:05 ryo Exp $ */
+/* $NetBSD: vmparam.h,v 1.33 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,8 +32,6 @@
#ifndef _EVBARM_VMPARAM_H_
#define _EVBARM_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
#ifdef __aarch64__
#include <aarch64/vmparam.h>
@@ -95,6 +93,4 @@
#endif
-#endif /* _KERNEL || _KMEMUSER */
-
#endif /* _EVBARM_VMPARAM_H_ */
Index: src/sys/arch/hpcarm/include/vmparam.h
diff -u src/sys/arch/hpcarm/include/vmparam.h:1.32 src/sys/arch/hpcarm/include/vmparam.h:1.33
--- src/sys/arch/hpcarm/include/vmparam.h:1.32 Thu Nov 2 05:42:44 2017
+++ src/sys/arch/hpcarm/include/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.32 2017/11/02 09:42:44 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.33 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,8 +32,6 @@
#ifndef _HPCARM_VMPARAM_H_
#define _HPCARM_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
#include <arm/arm32/vmparam.h>
/*
@@ -81,6 +79,4 @@
#define VM_FREELIST_DEFAULT 0
#define VM_FREELIST_ISADMA 1
-#endif /* _KERNEL || _KMEMUSER */
-
#endif /* _HPCARM_VMPARAM_H_ */
Index: src/sys/arch/iyonix/include/vmparam.h
diff -u src/sys/arch/iyonix/include/vmparam.h:1.7 src/sys/arch/iyonix/include/vmparam.h:1.8
--- src/sys/arch/iyonix/include/vmparam.h:1.7 Thu Nov 2 05:42:44 2017
+++ src/sys/arch/iyonix/include/vmparam.h Wed Mar 27 13:15:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.7 2017/11/02 09:42:44 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.8 2019/03/27 17:15:29 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,8 +32,6 @@
#ifndef _IYONIX_VMPARAM_H_
#define _IYONIX_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
#include <arm/arm32/vmparam.h>
/*
@@ -81,6 +79,4 @@
#define VM_FREELIST_DEFAULT 0
#define VM_FREELIST_ISADMA 1
-#endif /* _KERNEL || _KMEMUSER */
-
#endif /* _IYONIX_VMPARAM_H_ */
Index: src/sys/arch/shark/include/vmparam.h
diff -u src/sys/arch/shark/include/vmparam.h:1.21 src/sys/arch/shark/include/vmparam.h:1.22
--- src/sys/arch/shark/include/vmparam.h:1.21 Thu Nov 2 05:42:45 2017
+++ src/sys/arch/shark/include/vmparam.h Wed Mar 27 13:15:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.21 2017/11/02 09:42:45 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.22 2019/03/27 17:15:30 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,8 +32,6 @@
#ifndef _SHARK_VMPARAM_H_
#define _SHARK_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
#include <arm/arm32/vmparam.h>
/*
@@ -83,6 +81,4 @@
#define VM_FREELIST_ISADMA 1
#define VM_FREELIST_RPCDMA 1
-#endif /* _KERNEL */
-
#endif /* _SHARK_VMPARAM_H_ */
Index: src/sys/arch/zaurus/include/vmparam.h
diff -u src/sys/arch/zaurus/include/vmparam.h:1.6 src/sys/arch/zaurus/include/vmparam.h:1.7
--- src/sys/arch/zaurus/include/vmparam.h:1.6 Thu Nov 2 05:42:45 2017
+++ src/sys/arch/zaurus/include/vmparam.h Wed Mar 27 13:15:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.6 2017/11/02 09:42:45 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.7 2019/03/27 17:15:30 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -32,8 +32,6 @@
#ifndef _ZAURUS_VMPARAM_H_
#define _ZAURUS_VMPARAM_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
#include <arm/arm32/vmparam.h>
/*
@@ -81,6 +79,4 @@
#define VM_FREELIST_DEFAULT 0
#define VM_FREELIST_ISADMA 1
-#endif /* _KERNEL || _KMEMUSER */
-
#endif /* _ZAURUS_VMPARAM_H_ */
