[src/trunk]: src/sys Revert maxdmap/maxsmap constification, as it causes prob...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1669498e21de
branches:  trunk
changeset: 765716:1669498e21de
user:      rmind <rmind%NetBSD.org@localhost>
date:      Fri Jun 03 17:58:18 2011 +0000

description:
Revert maxdmap/maxsmap constification, as it causes problems on some
sparc models.  Reported by tsutsui@.

diffstat:

 sys/arch/sparc/sparc/machdep.c |  8 ++++----
 sys/kern/kern_resource.c       |  8 ++++----
 sys/sys/resourcevar.h          |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (80 lines):

diff -r 6a6a9316c609 -r 1669498e21de sys/arch/sparc/sparc/machdep.c
--- a/sys/arch/sparc/sparc/machdep.c    Fri Jun 03 17:11:34 2011 +0000
+++ b/sys/arch/sparc/sparc/machdep.c    Fri Jun 03 17:58:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.309 2011/05/16 18:08:04 rmind Exp $ */
+/*     $NetBSD: machdep.c,v 1.310 2011/06/03 17:58:18 rmind Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.309 2011/05/16 18:08:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.310 2011/06/03 17:58:18 rmind Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_sunos.h"
@@ -306,10 +306,10 @@
 
                /* Clip max data & stack to avoid running into the MMU hole */
 #if MAXDSIZ > 256*1024*1024
-               *(rlim_t*)__UNCONST(&maxdmap) = 256*1024*1024;
+               maxdmap = 256*1024*1024;
 #endif
 #if MAXSSIZ > 256*1024*1024
-               *(rlim_t*)__UNCONST(&maxsmap) = 256*1024*1024;
+               maxsmap = 256*1024*1024;
 #endif
        }
 
diff -r 6a6a9316c609 -r 1669498e21de sys/kern/kern_resource.c
--- a/sys/kern/kern_resource.c  Fri Jun 03 17:11:34 2011 +0000
+++ b/sys/kern/kern_resource.c  Fri Jun 03 17:58:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_resource.c,v 1.166 2011/05/31 00:15:28 rmind Exp $        */
+/*     $NetBSD: kern_resource.c,v 1.167 2011/06/03 17:58:18 rmind Exp $        */
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.166 2011/05/31 00:15:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.167 2011/06/03 17:58:18 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,8 +62,8 @@
  * Maximum process data and stack limits.
  * They are variables so they are patchable.
  */
-const rlim_t           maxdmap = MAXDSIZ;
-const rlim_t           maxsmap = MAXSSIZ;
+rlim_t                 maxdmap = MAXDSIZ;
+rlim_t                 maxsmap = MAXSSIZ;
 
 static pool_cache_t    plimit_cache    __read_mostly;
 static pool_cache_t    pstats_cache    __read_mostly;
diff -r 6a6a9316c609 -r 1669498e21de sys/sys/resourcevar.h
--- a/sys/sys/resourcevar.h     Fri Jun 03 17:11:34 2011 +0000
+++ b/sys/sys/resourcevar.h     Fri Jun 03 17:58:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: resourcevar.h,v 1.52 2011/05/14 17:57:05 rmind Exp $   */
+/*     $NetBSD: resourcevar.h,v 1.53 2011/06/03 17:58:18 rmind Exp $   */
 
 /*
  * Copyright (c) 1991, 1993
@@ -117,8 +117,8 @@
 void   rulwps(proc_t *, struct rusage *);
 struct pstats *pstatscopy(struct pstats *);
 void   pstatsfree(struct pstats *);
-extern const rlim_t maxdmap;
-extern const rlim_t maxsmap;
+extern rlim_t maxdmap;
+extern rlim_t maxsmap;
 
 #endif