From cfdd2383354dbd44b65b3532519734efc5282277 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sun, 12 Dec 1999 16:34:43 +0000 Subject: [PATCH] Put on asbestos suit and put a splcam() around the 'Mounting root from..' message to stop it splitting. Every single scsi machine I've seen seems to reliably collide with this and it's rather annoying. --- sys/kern/vfs_conf.c | 3 +++ sys/kern/vfs_mount.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index a60bef0a68e..04cf2b15a48 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -166,6 +166,7 @@ vfs_mountroot_try(char *mountfrom) char *vfsname, *path; int error; char patt[32]; + int s; vfsname = NULL; path = NULL; @@ -175,7 +176,9 @@ vfs_mountroot_try(char *mountfrom) if (mountfrom == NULL) return(error); /* don't complain */ + s = splcam(); /* Overkill, but annoying without it */ printf("Mounting root from %s\n", mountfrom); + splx(s); /* parse vfs name and path */ vfsname = malloc(MFSNAMELEN, M_MOUNT, M_WAITOK); diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index a60bef0a68e..04cf2b15a48 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -166,6 +166,7 @@ vfs_mountroot_try(char *mountfrom) char *vfsname, *path; int error; char patt[32]; + int s; vfsname = NULL; path = NULL; @@ -175,7 +176,9 @@ vfs_mountroot_try(char *mountfrom) if (mountfrom == NULL) return(error); /* don't complain */ + s = splcam(); /* Overkill, but annoying without it */ printf("Mounting root from %s\n", mountfrom); + splx(s); /* parse vfs name and path */ vfsname = malloc(MFSNAMELEN, M_MOUNT, M_WAITOK);