Module Name: src
Committed By: matt
Date: Tue Jun 30 04:20:19 UTC 2015
Modified Files:
src/sys/arch/mips/include: proc.h vmparam.h
Log Message:
Make vmparam.h change work with RUMP
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/include/proc.h
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/mips/include/vmparam.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/mips/include/proc.h
diff -u src/sys/arch/mips/include/proc.h:1.27 src/sys/arch/mips/include/proc.h:1.28
--- src/sys/arch/mips/include/proc.h:1.27 Sun Feb 20 07:45:47 2011
+++ src/sys/arch/mips/include/proc.h Tue Jun 30 04:20:19 2015
@@ -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 @@ struct mdlwp {
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 {
Index: src/sys/arch/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.53 src/sys/arch/mips/include/vmparam.h:1.54
--- src/sys/arch/mips/include/vmparam.h:1.53 Tue Jun 30 03:41:04 2015
+++ src/sys/arch/mips/include/vmparam.h Tue Jun 30 04:20:19 2015
@@ -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_multiprocessor.h"
#include "opt_cputype.h"
+#include "opt_multiprocessor.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.
