diff options
| author | phk <phk@FreeBSD.org> | 2003-04-13 09:02:06 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-04-13 09:02:06 +0000 |
| commit | 03b1ca36baf4bd8325f619d97a48764fc6dced85 (patch) | |
| tree | 7e373e1543fdcdee14db44b0c4513544d165797c /sys/geom/geom_event.c | |
| parent | 0f2f76bb732fd63d44ad2f323b86acb6c93a7230 (diff) | |
| download | FreeBSD-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_event.c')
| -rw-r--r-- | sys/geom/geom_event.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c index c6e95f4..41d9ab5 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -41,14 +41,6 @@ */ #include <sys/param.h> -#ifndef _KERNEL -#include <stdio.h> -#include <unistd.h> -#include <string.h> -#include <stdlib.h> -#include <signal.h> -#include <err.h> -#else #include <sys/malloc.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -56,7 +48,6 @@ #include <sys/mutex.h> #include <sys/eventhandler.h> #include <machine/stdarg.h> -#endif #include <sys/errno.h> #include <sys/time.h> #include <geom/geom.h> @@ -357,24 +348,20 @@ g_call_me(g_call_me_t *func, void *arg, ...) return (0); } -#ifdef _KERNEL static void geom_shutdown(void *foo __unused) { g_shutdown = 1; } -#endif void g_event_init() { -#ifdef _KERNEL EVENTHANDLER_REGISTER(shutdown_pre_sync, geom_shutdown, NULL, SHUTDOWN_PRI_FIRST); -#endif mtx_init(&g_eventlock, "GEOM orphanage", NULL, MTX_DEF); sx_init(&g_eventstall, "GEOM event stalling"); } |
