[src/trunk]: src/sys/arch/mips/include Make vmparam.h change work with RUMP

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

details:   https://anonhg.NetBSD.org/src/rev/bc0301a74a82
branches:  trunk
changeset: 339154:bc0301a74a82
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jun 30 04:20:19 2015 +0000

description:
Make vmparam.h change work with RUMP

diffstat:

 sys/arch/mips/include/proc.h    |  8 ++------
 sys/arch/mips/include/vmparam.h |  7 +++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r af3f5a3bfa95 -r bc0301a74a82 sys/arch/mips/include/proc.h
--- a/sys/arch/mips/include/proc.h      Tue Jun 30 04:10:10 2015 +0000
+++ b/sys/arch/mips/include/proc.h      Tue Jun 30 04:20:19 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: proc.h,v 1.27 2011/02/20 07:45:47 matt Exp $   */
+/*     $NetBSD: proc.h,v 1.28 2015/06/30 04:20:19 matt Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -52,11 +52,7 @@
        vaddr_t md_ss_addr;             /* single step address for ptrace */
        int     md_ss_instr;            /* single step instruction for ptrace */
        volatile int md_astpending;     /* AST pending on return to userland */
-#if USPACE > PAGE_SIZE
-       int     md_upte[USPACE/4096];   /* ptes for mapping u page */
-#else
-       int     md_dpte[USPACE/4096];   /* dummy ptes to keep the same */
-#endif
+       int     md_upte[2];             /* ptes for mapping u page */
 };
 
 struct mdproc {
diff -r af3f5a3bfa95 -r bc0301a74a82 sys/arch/mips/include/vmparam.h
--- a/sys/arch/mips/include/vmparam.h   Tue Jun 30 04:10:10 2015 +0000
+++ b/sys/arch/mips/include/vmparam.h   Tue Jun 30 04:20:19 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.53 2015/06/30 03:41:04 matt Exp $        */
+/*     $NetBSD: vmparam.h,v 1.54 2015/06/30 04:20:19 matt Exp $        */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -42,15 +42,18 @@
 #define        _MIPS_VMPARAM_H_
 
 #ifdef _KERNEL_OPT
+#include "opt_cputype.h"
 #include "opt_multiprocessor.h"
-#include "opt_cputype.h"
+#include "opt_modular.h"
 #endif
 
 /*
  * Machine dependent VM constants for MIPS.
  */
+#if !defined(_RUMPKERNEL) && (defined(MODULAR) || defined(_MODULE))
 #define MAX_PAGE_SIZE  16384
 #define MIN_PAGE_SIZE  4096
+#endif
 
 /*
  * We normally use a 4K page but may use 16K on MIPS systems.