Module Name: src
Committed By: matt
Date: Thu Feb 23 20:49:46 UTC 2012
Modified Files:
src/sys/uvm: uvm_param.h
Log Message:
Add "opt_modular.h"
#define __uvmexp_pagesize
if MIN_PAGE_SIZE != MAX_PAGE_SIZE && modular is defined
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/uvm/uvm_param.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/uvm/uvm_param.h
diff -u src/sys/uvm/uvm_param.h:1.27 src/sys/uvm/uvm_param.h:1.28
--- src/sys/uvm/uvm_param.h:1.27 Fri Feb 17 23:41:02 2012
+++ src/sys/uvm/uvm_param.h Thu Feb 23 20:49:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_param.h,v 1.27 2012/02/17 23:41:02 matt Exp $ */
+/* $NetBSD: uvm_param.h,v 1.28 2012/02/23 20:49:46 matt Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -68,6 +68,7 @@
#define _VM_PARAM_
#ifdef _KERNEL_OPT
+#include "opt_modular.h"
#include "opt_uvm.h"
#endif
#ifdef _KERNEL
@@ -134,11 +135,16 @@
* If MIN_PAGE_SIZE and MAX_PAGE_SIZE are not equal, then we must use
* non-constant PAGE_SIZE, et al for LKMs.
*/
-#if (MIN_PAGE_SIZE != MAX_PAGE_SIZE) && (defined(_LKM) || defined(MODULAR))
+#if (MIN_PAGE_SIZE != MAX_PAGE_SIZE)
+#if defined(MODULAR)
+#define __uvmexp_pagesize
+#endif
+#if defined(_LKM) || defined(_MODULE)
#undef PAGE_SIZE
#undef PAGE_MASK
#undef PAGE_SHIFT
#endif
+#endif
/*
* Now provide PAGE_SIZE, PAGE_MASK, and PAGE_SHIFT if we do not
@@ -151,7 +157,6 @@ extern const int *const uvmexp_pageshift
#define PAGE_SIZE (*uvmexp_pagesize) /* size of page */
#define PAGE_MASK (*uvmexp_pagemask) /* size of page - 1 */
#define PAGE_SHIFT (*uvmexp_pageshift) /* bits to shift for pages */
-#define __uvmexp_pagesize
#endif /* PAGE_SIZE */
#endif /* _KERNEL */
