summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-11-10 19:20:40 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-11-10 19:20:40 +0000
commit499d6eb5bd69bc9c0b22b90a636038757039d4f2 (patch)
tree5ba9b95767c91507c620bf86db73015cc2ef2bca
parentbbe8f62ec65096ee1bb8589c0f3ade29b85553c4 (diff)
Move maxdmap and maxsmap to kern_resource.c
-rw-r--r--sys/kern/kern_resource.c9
-rw-r--r--sys/uvm/uvm_glue.c7
2 files changed, 9 insertions, 7 deletions
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 668c38f28be..0b65376886f 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_resource.c,v 1.15 2001/11/06 19:53:20 miod Exp $ */
+/* $OpenBSD: kern_resource.c,v 1.16 2001/11/10 19:20:39 art Exp $ */
/* $NetBSD: kern_resource.c,v 1.38 1996/10/23 07:19:38 matthias Exp $ */
/*-
@@ -55,6 +55,12 @@
#include <uvm/uvm_extern.h>
/*
+ * Patchable maximum data and stack limits.
+ */
+rlim_t maxdmap = MAXDSIZ;
+rlim_t maxsmap = MAXSSIZ;
+
+/*
* Resource controls and accounting.
*/
@@ -227,7 +233,6 @@ dosetrlimit(p, which, limp)
struct rlimit *limp;
{
struct rlimit *alimp;
- extern unsigned maxdmap, maxsmap;
rlim_t maxlim;
int error;
diff --git a/sys/uvm/uvm_glue.c b/sys/uvm/uvm_glue.c
index 809350d603f..78e881bef6e 100644
--- a/sys/uvm/uvm_glue.c
+++ b/sys/uvm/uvm_glue.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uvm_glue.c,v 1.25 2001/11/07 02:55:50 art Exp $ */
-/* $NetBSD: uvm_glue.c,v 1.43 2000/11/25 06:27:59 chs Exp $ */
+/* $OpenBSD: uvm_glue.c,v 1.26 2001/11/10 19:20:39 art Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.44 2001/02/06 19:54:44 eeh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -95,9 +95,6 @@ static void uvm_swapout __P((struct proc *));
* XXXCDC: do these really belong here?
*/
-unsigned maxdmap = MAXDSIZ; /* kern_resource.c: RLIMIT_DATA max */
-unsigned maxsmap = MAXSSIZ; /* kern_resource.c: RLIMIT_STACK max */
-
int readbuffers = 0; /* allow KGDB to read kern buffer pool */
/* XXX: see uvm_kernacc */