summaryrefslogtreecommitdiffstats
path: root/sys/geom/geom_subr.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-04-13 09:02:06 +0000
committerphk <phk@FreeBSD.org>2003-04-13 09:02:06 +0000
commit03b1ca36baf4bd8325f619d97a48764fc6dced85 (patch)
tree7e373e1543fdcdee14db44b0c4513544d165797c /sys/geom/geom_subr.c
parent0f2f76bb732fd63d44ad2f323b86acb6c93a7230 (diff)
downloadFreeBSD-src-03b1ca36baf4bd8325f619d97a48764fc6dced85.zip
FreeBSD-src-03b1ca36baf4bd8325f619d97a48764fc6dced85.tar.gz
Time has run from the "run GEOM in userland" harness, and the new regression
test is built to test GEOM as running in the kernel. This commit is basically "unifdef -D_KERNEL" to remove the mainly #include related code to support the userland-harness.
Diffstat (limited to 'sys/geom/geom_subr.c')
-rw-r--r--sys/geom/geom_subr.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index fbaa6c7..a74cadb 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -37,14 +37,6 @@
#include <sys/param.h>
-#ifndef _KERNEL
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <string.h>
-#include <err.h>
-#else
#include <sys/systm.h>
#include <sys/devicestat.h>
#include <sys/kernel.h>
@@ -55,7 +47,6 @@
#include <sys/kthread.h>
#include <sys/lock.h>
#include <sys/mutex.h>
-#endif
#include <sys/errno.h>
#include <sys/sbuf.h>
#include <geom/geom.h>
@@ -619,7 +610,6 @@ g_sanity(void *ptr)
}
}
-#ifdef _KERNEL
struct g_class *
g_idclass(struct geomidorname *p)
{
@@ -703,4 +693,3 @@ g_idprovider(struct geomidorname *p)
g_free(n);
return (NULL);
}
-#endif /* _KERNEL */
OpenPOWER on IntegriCloud