Module Name: src
Committed By: pooka
Date: Tue May 11 20:21:56 UTC 2010
Modified Files:
src/sys/kern: uipc_mbuf.c
src/sys/rump/librump/rumpkern: emul.c
Log Message:
remove unnecessary #ifdef
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.135 -r1.136 src/sys/rump/librump/rumpkern/emul.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.135 src/sys/kern/uipc_mbuf.c:1.136
--- src/sys/kern/uipc_mbuf.c:1.135 Fri Apr 16 02:57:15 2010
+++ src/sys/kern/uipc_mbuf.c Tue May 11 20:21:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.135 2010/04/16 02:57:15 rmind Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.136 2010/05/11 20:21:56 pooka Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.135 2010/04/16 02:57:15 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.136 2010/05/11 20:21:56 pooka Exp $");
#include "opt_mbuftrace.h"
#include "opt_nmbclusters.h"
@@ -153,7 +153,7 @@
static int
nmbclusters_limit(void)
{
-#if defined(PMAP_MAP_POOLPAGE) || defined(_RUMPKERNEL)
+#if defined(PMAP_MAP_POOLPAGE)
/* direct mapping, doesn't use space in kmem_map */
vsize_t max_size = physmem / 4;
#else
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.135 src/sys/rump/librump/rumpkern/emul.c:1.136
--- src/sys/rump/librump/rumpkern/emul.c:1.135 Sat May 1 09:00:06 2010
+++ src/sys/rump/librump/rumpkern/emul.c Tue May 11 20:21:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.135 2010/05/01 09:00:06 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.136 2010/05/11 20:21:56 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.135 2010/05/01 09:00:06 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.136 2010/05/11 20:21:56 pooka Exp $");
#include <sys/param.h>
#include <sys/null.h>
@@ -67,6 +67,7 @@
struct vnode *rootvp;
dev_t rootdev = NODEV;
int physmem = 256*256; /* 256 * 1024*1024 / 4k, PAGE_SIZE not always set */
+int nkmempages = 256*256/2; /* 256 * 1024*1024 / 4k, PAGE_SIZE not always set */
const int schedppq = 1;
int hardclock_ticks;
bool mp_online = false;
