aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/geom/geom_disk.c9
-rw-r--r--sys/kern/kern_conf.c4
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 76c613f354ff..4c219a1825c1 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -261,15 +261,6 @@ disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, struct
return (dev);
}
-void disk_dev_synth(dev_t dev);
-
-void
-disk_dev_synth(dev_t dev)
-{
-
- return;
-}
-
void
disk_destroy(dev_t dev)
{
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index a38928e7f484..3f453b8cfe4e 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -70,16 +70,20 @@ static int ready_for_devs;
static int free_devt;
SYSCTL_INT(_debug, OID_AUTO, free_devt, CTLFLAG_RW, &free_devt, 0, "");
+#ifdef NO_GEOM
/* XXX: This is a hack */
void disk_dev_synth(dev_t dev);
+#endif
struct cdevsw *
devsw(dev_t dev)
{
if (dev->si_devsw)
return (dev->si_devsw);
+#ifdef NO_GEOM
/* XXX: Hack around our backwards disk code */
disk_dev_synth(dev);
+#endif
if (dev->si_devsw)
return (dev->si_devsw);
#ifndef NODEVFS