summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2005-11-10 08:10:17 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2005-11-10 08:10:17 +0000
commitfa9ddbbc5e20f7624605dba8937d31118bbf1576 (patch)
treed9914d1ddf5e1b59431d4e04fdda3cab30a77f45 /sys/kern
parent6b2358459d646cfaf3662af65ddafb218104efb2 (diff)
split the sensors stuff out into a source file of its own.
tested on GENERIC and RAMDISK_CD to see if the small_kernel stuff stays happy
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_sensors.c28
-rw-r--r--sys/kern/kern_sysctl.c4
2 files changed, 29 insertions, 3 deletions
diff --git a/sys/kern/kern_sensors.c b/sys/kern/kern_sensors.c
new file mode 100644
index 00000000000..6a3a67420c6
--- /dev/null
+++ b/sys/kern/kern_sensors.c
@@ -0,0 +1,28 @@
+/* $OpenBSD: kern_sensors.c,v 1.1 2005/11/10 08:10:16 dlg Exp $ */
+
+/*
+ * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/time.h>
+
+#include <sys/sensors.h>
+
+int nsensors = 0;
+struct sensors_head sensors = SLIST_HEAD_INITIALIZER(&sensors);
+
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 7513ea171f3..064aca59438 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_sysctl.c,v 1.132 2005/11/04 21:47:57 miod Exp $ */
+/* $OpenBSD: kern_sysctl.c,v 1.133 2005/11/10 08:10:16 dlg Exp $ */
/* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */
/*-
@@ -1827,8 +1827,6 @@ sysctl_intrcnt(int *name, u_int namelen, void *oldp, size_t *oldlenp)
return (evcount_sysctl(name, namelen, oldp, oldlenp, NULL, 0));
}
-int nsensors = 0;
-struct sensors_head sensors = SLIST_HEAD_INITIALIZER(&sensors);
int
sysctl_sensors(int *name, u_int namelen, void *oldp, size_t *oldlenp,