Module Name: src
Committed By: matt
Date: Tue Dec 27 16:09:36 UTC 2011
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: mips_param.h pmap.h
vmparam.h
Log Message:
Deal with not defining PAGE_SIZE or PAGE_SHIFT for non-kernel inclusion.
To generate a diff of this commit:
cvs rdiff -u -r1.23.78.10 -r1.23.78.11 src/sys/arch/mips/include/mips_param.h
cvs rdiff -u -r1.54.26.21 -r1.54.26.22 src/sys/arch/mips/include/pmap.h
cvs rdiff -u -r1.41.28.24 -r1.41.28.25 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/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.23.78.10 src/sys/arch/mips/include/mips_param.h:1.23.78.11
--- src/sys/arch/mips/include/mips_param.h:1.23.78.10 Tue Dec 27 01:56:33 2011
+++ src/sys/arch/mips/include/mips_param.h Tue Dec 27 16:09:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_param.h,v 1.23.78.10 2011/12/27 01:56:33 matt Exp $ */
+/* $NetBSD: mips_param.h,v 1.23.78.11 2011/12/27 16:09:36 matt Exp $ */
#ifdef _KERNEL
#include <machine/cpu.h>
@@ -39,7 +39,8 @@
#define SSIZE 1 /* initial stack size/NBPG */
#define SINCR 1 /* increment of stack/NBPG */
-#if defined(_KERNEL) && !defined(_MODULE)
+#if defined(_KERNEL) && !defined(_RUMPKERNEL) \
+ && !defined(_MODULE) && !defined(_LKM)
#ifdef PAGE_SHIFT
#if MIPS_PAGE_SHIFT != PAGE_SHIFT
#error MIPS_PAGE_SHIFT != PAGE_SHIFT
@@ -49,7 +50,7 @@
#else
#define PAGE_SHIFT 12
#endif
-#endif /* _KERNEL && !_MODULE */
+#endif /* _KERNEL && !_RUMPKERNEL && !_MODULE && !_LKM */
#if PAGE_SHIFT & 1
#define UPAGES 1 /* pages of u-area */
Index: src/sys/arch/mips/include/pmap.h
diff -u src/sys/arch/mips/include/pmap.h:1.54.26.21 src/sys/arch/mips/include/pmap.h:1.54.26.22
--- src/sys/arch/mips/include/pmap.h:1.54.26.21 Tue Dec 27 01:56:33 2011
+++ src/sys/arch/mips/include/pmap.h Tue Dec 27 16:09:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.54.26.21 2011/12/27 01:56:33 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.54.26.22 2011/12/27 16:09:36 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -81,7 +81,7 @@
#include <mips/cpuregs.h> /* for KSEG0 below */
//#include <mips/pte.h>
-#if !defined(_MODULE)
+#if !defined(_MODULE) && !defined(_LKM)
/*
* The user address space is 2Gb (0x0 - 0x80000000).
* User programs are laid out in memory as follows:
Index: src/sys/arch/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.41.28.24 src/sys/arch/mips/include/vmparam.h:1.41.28.25
--- src/sys/arch/mips/include/vmparam.h:1.41.28.24 Tue Dec 27 01:56:33 2011
+++ src/sys/arch/mips/include/vmparam.h Tue Dec 27 16:09:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.41.28.24 2011/12/27 01:56:33 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.41.28.25 2011/12/27 16:09:36 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -54,7 +54,10 @@
* We normally use a 4K page but may use 8K, 16K, or 32K on MIPS systems.
* Override PAGE_* definitions to compile-time constants.
*/
-#if defined(_KERNEL_OPT) && defined(_KERNEL) && !defined(_MODULE)
+#if defined(_RUMPKERNEL)
+#define PAGE_SHIFT 12
+#elif defined(_KERNEL_OPT) && defined(_KERNEL) \
+ && !defined(_MODULE) && !defined(_LKM)
#ifdef MIPS_PAGE_SHIFT
#define PAGE_SHIFT MIPS_PAGE_SHIFT
#else
@@ -165,15 +168,14 @@
* These are negative addresses since MIPS addresses are signed.
*/
#define VM_MIN_ADDRESS ((vaddr_t)0x00000000)
+#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS
#ifdef _LP64
#define VM_MAXUSER_ADDRESS ((vaddr_t) 1L << (4*PGSHIFT-8))
/* 0x0000010000000000 */
-#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS
#define VM_MIN_KERNEL_ADDRESS ((vaddr_t) 3L << 62) /* 0xC000000000000000 */
#define VM_MAX_KERNEL_ADDRESS ((vaddr_t) -1L << 31) /* 0xFFFFFFFF80000000 */
#else
-#define VM_MAXUSER_ADDRESS ((vaddr_t)-0x7fffffff-1)/* 0xFFFFFFFF80000000 */
-#define VM_MAX_ADDRESS ((vaddr_t)-0x7fffffff-1)/* 0xFFFFFFFF80000000 */
+#define VM_MAXUSER_ADDRESS ((vaddr_t)0x80000000) /* 0x0000000080000000 */
#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)-0x40000000) /* 0xFFFFFFFFC0000000 */
#ifdef ENABLE_MIPS_TX3900
#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)-0x01000000) /* 0xFFFFFFFFFF000000 */
