Module Name: src
Committed By: christos
Date: Sat Jan 25 15:16:50 UTC 2014
Modified Files:
src/sys/arch/amd64/include: vmparam.h
src/sys/arch/i386/include: vmparam.h
src/sys/arch/mips/include: vmparam.h
src/sys/arch/powerpc/include: vmparam.h
src/sys/arch/vax/include: vmparam.h
Log Message:
delete VM_DEFAULT_ADDRESS; some of those should be GC'ed because they match
the default definition.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amd64/include/vmparam.h
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/i386/include/vmparam.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/vmparam.h
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/vax/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/amd64/include/vmparam.h
diff -u src/sys/arch/amd64/include/vmparam.h:1.33 src/sys/arch/amd64/include/vmparam.h:1.34
--- src/sys/arch/amd64/include/vmparam.h:1.33 Sat Jan 25 00:09:59 2014
+++ src/sys/arch/amd64/include/vmparam.h Sat Jan 25 10:16:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.33 2014/01/25 05:09:59 christos Exp $ */
+/* $NetBSD: vmparam.h,v 1.34 2014/01/25 15:16:49 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -133,12 +133,12 @@
#include "opt_uvm.h"
#endif
#define __USE_TOPDOWN_VM
+
#define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \
trunc_page(USRSTACK - MAXSSIZ - (sz))
-#define VM_DEFAULT_ADDRESS(da, sz) VM_DEFAULT_ADDRESS_TOPDOWN(da, sz)
-
#define VM_DEFAULT_ADDRESS_BOTTOMUP(da, sz) \
round_page((vaddr_t)(da) + (vsize_t)maxdmap)
+
#define VM_DEFAULT_ADDRESS32_TOPDOWN(da, sz) \
trunc_page(USRSTACK32 - MAXSSIZ32 - (sz))
#define VM_DEFAULT_ADDRESS32_BOTTOMUP(da, sz) \
Index: src/sys/arch/i386/include/vmparam.h
diff -u src/sys/arch/i386/include/vmparam.h:1.76 src/sys/arch/i386/include/vmparam.h:1.77
--- src/sys/arch/i386/include/vmparam.h:1.76 Tue Nov 13 09:10:24 2012
+++ src/sys/arch/i386/include/vmparam.h Sat Jan 25 10:16:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.76 2012/11/13 14:10:24 chs Exp $ */
+/* $NetBSD: vmparam.h,v 1.77 2014/01/25 15:16:50 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -110,8 +110,10 @@
#include "opt_xen.h"
#endif
#define __USE_TOPDOWN_VM
-#define VM_DEFAULT_ADDRESS(da, sz) \
- trunc_page(USRSTACK - MAXSSIZ - (sz))
+#define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \
+ trunc_page(USRSTACK - MAXSSIZ - (sz))
+#define VM_DEFAULT_ADDRESS_BOTTOMUP(da, sz) \
+ round_page((vaddr_t)(da) + (vsize_t)maxdmap)
/* XXX max. amount of KVM to be used by buffers. */
#ifndef VM_MAX_KERNEL_BUF
Index: src/sys/arch/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.51 src/sys/arch/mips/include/vmparam.h:1.52
--- src/sys/arch/mips/include/vmparam.h:1.51 Wed Jan 22 15:49:19 2014
+++ src/sys/arch/mips/include/vmparam.h Sat Jan 25 10:16:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.51 2014/01/22 20:49:19 christos Exp $ */
+/* $NetBSD: vmparam.h,v 1.52 2014/01/25 15:16:50 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -178,10 +178,16 @@
* The address to which unspecified mapping requests default
*/
#define __USE_TOPDOWN_VM
-#define VM_DEFAULT_ADDRESS(da, sz) \
- trunc_page(USRSTACK - MAXSSIZ - (sz))
-#define VM_DEFAULT_ADDRESS32(da, sz) \
- trunc_page(USRSTACK32 - MAXSSIZ32 - (sz))
+
+#define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \
+ trunc_page(USRSTACK - MAXSSIZ - (sz))
+#define VM_DEFAULT_ADDRESS_BOTTOMUP(da, sz) \
+ round_page((vaddr_t)(da) + (vsize_t)maxdmap)
+
+#define VM_DEFAULT_ADDRESS32_TOPDOWN(da, sz) \
+ trunc_page(USRSTACK32 - MAXSSIZ32 - (sz))
+#define VM_DEFAULT_ADDRESS32_BOTTOMUP(da, sz) \
+ round_page((vaddr_t)(da) + (vsize_t)MAXDSIZ32)
/* virtual sizes (bytes) for various kernel submaps */
#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
Index: src/sys/arch/powerpc/include/vmparam.h
diff -u src/sys/arch/powerpc/include/vmparam.h:1.17 src/sys/arch/powerpc/include/vmparam.h:1.18
--- src/sys/arch/powerpc/include/vmparam.h:1.17 Thu Feb 23 15:33:29 2012
+++ src/sys/arch/powerpc/include/vmparam.h Sat Jan 25 10:16:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.17 2012/02/23 20:33:29 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.18 2014/01/25 15:16:50 christos Exp $ */
#ifndef _POWERPC_VMPARAM_H_
#define _POWERPC_VMPARAM_H_
@@ -25,8 +25,10 @@
* top of the next lower segment.
*/
#define __USE_TOPDOWN_VM
-#define VM_DEFAULT_ADDRESS(da, sz) \
- ((VM_MAXUSER_ADDRESS - MAXSSIZ) - round_page(sz))
+#define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \
+ ((VM_MAXUSER_ADDRESS - MAXSSIZ) - round_page(sz))
+#define VM_DEFAULT_ADDRESS_BOTTOMUP(da, sz) \
+ round_page((vaddr_t)(da) + (vsize_t)maxdmap)
#if defined(_MODULE) || defined(MODULAR)
/*
Index: src/sys/arch/vax/include/vmparam.h
diff -u src/sys/arch/vax/include/vmparam.h:1.48 src/sys/arch/vax/include/vmparam.h:1.49
--- src/sys/arch/vax/include/vmparam.h:1.48 Wed Sep 18 09:31:39 2013
+++ src/sys/arch/vax/include/vmparam.h Sat Jan 25 10:16:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.48 2013/09/18 13:31:39 martin Exp $ */
+/* $NetBSD: vmparam.h,v 1.49 2014/01/25 15:16:50 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -102,8 +102,10 @@
* The address to which unspecified mapping requests default
*/
#define __USE_TOPDOWN_VM
-#define VM_DEFAULT_ADDRESS(da, sz) \
- trunc_page(VM_MAXUSER_ADDRESS - MAXSSIZ - (sz))
+#define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \
+ trunc_page(VM_MAXUSER_ADDRESS - MAXSSIZ - (sz))
+#define VM_DEFAULT_ADDRESS_BOTTOMUP(da, sz) \
+ round_page((vaddr_t)(da) + (vsize_t)maxdmap)
#define USRIOSIZE (8 * VAX_NPTEPG) /* 512MB */
#define VM_PHYS_SIZE (USRIOSIZE*VAX_NBPG)
