[src/trunk]: src/sys/arch/sun3/include Raise the blade, make the change, don'...

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

details:   https://anonhg.NetBSD.org/src/rev/f6fc9e693759
branches:  trunk
changeset: 754440:f6fc9e693759
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Apr 30 13:48:55 2010 +0000

description:
Raise the blade, make the change, don't quite rearrange to where
it's sane.  But improves the non-monolithic kernel case anyway.

diffstat:

 sys/arch/sun3/include/vmparam.h   |  20 ++++++++++++--------
 sys/arch/sun3/include/vmparam3.h  |   7 +------
 sys/arch/sun3/include/vmparam3x.h |   7 +------
 3 files changed, 14 insertions(+), 20 deletions(-)

diffs (83 lines):

diff -r 869ebb288136 -r f6fc9e693759 sys/arch/sun3/include/vmparam.h
--- a/sys/arch/sun3/include/vmparam.h   Fri Apr 30 10:24:02 2010 +0000
+++ b/sys/arch/sun3/include/vmparam.h   Fri Apr 30 13:48:55 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.33 2008/04/28 20:23:38 martin Exp $      */
+/*     $NetBSD: vmparam.h,v 1.34 2010/04/30 13:48:55 pooka Exp $       */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,20 +37,24 @@
 #define        PAGE_SIZE       (1 << PAGE_SHIFT)
 #define        PAGE_MASK       (PAGE_SIZE - 1)
 
+#define        USRSTACK        KERNBASE
+
 #ifdef _SUN3_
 #include <machine/vmparam3.h>
 #endif /* SUN3 */
 #ifdef _SUN3X_
 #include <machine/vmparam3x.h>
 #endif /* SUN3X */
-#ifdef _LKM
-#define        USRSTACK KERNBASE
-/* Be conservative. If an LKM is gonna be built for sun3x, define this first */
-#ifndef MAXDSIZ
-#define MAXDSIZ         (32*1024*1024)          /* max data size */
+
+/* default for modules etc. */
+#if !defined(_SUN3_) && !defined(_SUN3X_)
+#include <machine/vmparam3.h>
 #endif
-extern char KERNBASE[];
-#endif /* _LKM */
+
+/* XXX: this makes modules *compile* */
+#ifdef _MODULE
+extern char KERNBASE[];
+#endif
 
 /* This is needed by some LKMs. */
 #define VM_PHYSSEG_MAX         4
diff -r 869ebb288136 -r f6fc9e693759 sys/arch/sun3/include/vmparam3.h
--- a/sys/arch/sun3/include/vmparam3.h  Fri Apr 30 10:24:02 2010 +0000
+++ b/sys/arch/sun3/include/vmparam3.h  Fri Apr 30 13:48:55 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam3.h,v 1.35 2009/03/06 20:31:53 joerg Exp $      */
+/*     $NetBSD: vmparam3.h,v 1.36 2010/04/30 13:48:55 pooka Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -92,11 +92,6 @@
  */
 
 /*
- * USRSTACK is the top (end) of the user stack.
- */
-#define        USRSTACK        KERNBASE        /* High end of user stack */
-
-/*
  * Virtual memory related constants, all in bytes.
  * The Sun3 has only 224 MB of user-virtual space,
  * so we need to be conservative with these limits.
diff -r 869ebb288136 -r f6fc9e693759 sys/arch/sun3/include/vmparam3x.h
--- a/sys/arch/sun3/include/vmparam3x.h Fri Apr 30 10:24:02 2010 +0000
+++ b/sys/arch/sun3/include/vmparam3x.h Fri Apr 30 13:48:55 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam3x.h,v 1.19 2009/03/06 20:31:53 joerg Exp $     */
+/*     $NetBSD: vmparam3x.h,v 1.20 2010/04/30 13:48:55 pooka Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -81,11 +81,6 @@
  */
 
 /*
- * USRSTACK is the top (end) of the user stack.
- */
-#define        USRSTACK        KERNBASE        /* High end of user stack */
-
-/*
  * Virtual memory related constants, all in bytes
  */
 #ifndef MAXTSIZ