Module Name: src
Committed By: pooka
Date: Fri Apr 30 13:48:55 UTC 2010
Modified Files:
src/sys/arch/sun3/include: vmparam.h vmparam3.h vmparam3x.h
Log Message:
Raise the blade, make the change, don't quite rearrange to where
it's sane. But improves the non-monolithic kernel case anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sun3/include/vmparam.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sun3/include/vmparam3.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sun3/include/vmparam3x.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/sun3/include/vmparam.h
diff -u src/sys/arch/sun3/include/vmparam.h:1.33 src/sys/arch/sun3/include/vmparam.h:1.34
--- src/sys/arch/sun3/include/vmparam.h:1.33 Mon Apr 28 20:23:38 2008
+++ src/sys/arch/sun3/include/vmparam.h Fri Apr 30 13:48:55 2010
@@ -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
+
+/* XXX: this makes modules *compile* */
+#ifdef _MODULE
+extern char KERNBASE[];
#endif
-extern char KERNBASE[];
-#endif /* _LKM */
/* This is needed by some LKMs. */
#define VM_PHYSSEG_MAX 4
Index: src/sys/arch/sun3/include/vmparam3.h
diff -u src/sys/arch/sun3/include/vmparam3.h:1.35 src/sys/arch/sun3/include/vmparam3.h:1.36
--- src/sys/arch/sun3/include/vmparam3.h:1.35 Fri Mar 6 20:31:53 2009
+++ src/sys/arch/sun3/include/vmparam3.h Fri Apr 30 13:48:55 2010
@@ -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.
Index: src/sys/arch/sun3/include/vmparam3x.h
diff -u src/sys/arch/sun3/include/vmparam3x.h:1.19 src/sys/arch/sun3/include/vmparam3x.h:1.20
--- src/sys/arch/sun3/include/vmparam3x.h:1.19 Fri Mar 6 20:31:53 2009
+++ src/sys/arch/sun3/include/vmparam3x.h Fri Apr 30 13:48:55 2010
@@ -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
