Module Name: src
Committed By: pooka
Date: Fri Dec 14 10:48:48 UTC 2012
Modified Files:
src/lib/librumpuser: rumpuser.c
Log Message:
FreeBSD and DragonFly also provide hosts cpus via sysctl hw.ncpu.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/librumpuser/rumpuser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.24 src/lib/librumpuser/rumpuser.c:1.25
--- src/lib/librumpuser/rumpuser.c:1.24 Thu Dec 13 15:35:09 2012
+++ src/lib/librumpuser/rumpuser.c Fri Dec 14 10:48:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.24 2012/12/13 15:35:09 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.25 2012/12/14 10:48:48 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.24 2012/12/13 15:35:09 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.25 2012/12/14 10:48:48 pooka Exp $");
#endif /* !lint */
#include <sys/ioctl.h>
@@ -41,10 +41,13 @@ __RCSID("$NetBSD: rumpuser.c,v 1.24 2012
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/dkio.h>
-#include <sys/sysctl.h>
#include <sys/event.h>
#endif
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#include <sys/sysctl.h>
+#endif
+
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
@@ -733,7 +736,7 @@ rumpuser_getnhostcpu(void)
{
int ncpu = 1;
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
size_t sz = sizeof(ncpu);
sysctlbyname("hw.ncpu", &ncpu, &sz, NULL, 0);
