summaryrefslogtreecommitdiffstats
path: root/sys/ia64
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2008-04-09 03:32:48 +0000
committermarcel <marcel@FreeBSD.org>2008-04-09 03:32:48 +0000
commit015b99f5de0cb08ea61dfd16e1e491a2db41fa68 (patch)
tree63c55391b5408eb65d73abfc4a9068b56e4c674e /sys/ia64
parent70b66c62768829b3b28008ea0f19d401fe18a706 (diff)
downloadFreeBSD-src-015b99f5de0cb08ea61dfd16e1e491a2db41fa68.zip
FreeBSD-src-015b99f5de0cb08ea61dfd16e1e491a2db41fa68.tar.gz
Unbreak after removal of SI_SUB_MOUNT_ROOT.
Diffstat (limited to 'sys/ia64')
-rw-r--r--sys/ia64/ia64/sscdisk.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c
index f5db9d5..2c5ef69 100644
--- a/sys/ia64/ia64/sscdisk.c
+++ b/sys/ia64/ia64/sscdisk.c
@@ -74,8 +74,6 @@ ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3, int which)
MALLOC_DEFINE(M_SSC, "ssc_disk", "Simulator Disk");
-static int sscrootready;
-
static d_strategy_t sscstrategy;
static LIST_HEAD(, ssc_s) ssc_softc_list = LIST_HEAD_INITIALIZER(&ssc_softc_list);
@@ -186,7 +184,7 @@ ssccreate(int unit)
disk_create(sc->disk, DISK_VERSION);
sc->fd = fd;
if (sc->unit == 0)
- sscrootready = 1;
+ rootdevnames[0] = "ufs:/dev/sscdisk0";
return (sc);
}
@@ -197,12 +195,3 @@ ssc_drvinit(void *unused)
}
SYSINIT(sscdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE, ssc_drvinit,NULL);
-
-static void
-ssc_takeroot(void *junk)
-{
- if (sscrootready)
- rootdevnames[0] = "ufs:/dev/sscdisk0";
-}
-
-SYSINIT(ssc_root, SI_SUB_MOUNT_ROOT, SI_ORDER_FIRST, ssc_takeroot, NULL);
OpenPOWER on IntegriCloud