D3787.id9059.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3787.id9059.diff
View Options

	Index: sys/kern/vfs_mountroot.c
	===================================================================
	--- sys/kern/vfs_mountroot.c
	+++ sys/kern/vfs_mountroot.c
	@@ -166,24 +166,6 @@
	return (root_mount_complete);
	}

	-void
	-root_mount_wait(void)
	-{
	-
	- /*
	- * Panic on an obvious deadlock - the function can't be called from
	- * a thread which is doing the whole SYSINIT stuff.
	- */
	- KASSERT(curthread->td_proc->p_pid != 0,
	- ("root_mount_wait: cannot be called from the swapper thread"));
	- mtx_lock(&root_holds_mtx);
	- while (!root_mount_complete) {
	- msleep(&root_mount_complete, &root_holds_mtx, PZERO, "rootwait",
	- hz);
	- }
	- mtx_unlock(&root_holds_mtx);
	-}
	-
	static void
	set_rootvnode(void)
	{
	Index: sys/sys/systm.h
	===================================================================
	--- sys/sys/systm.h
	+++ sys/sys/systm.h
	@@ -411,7 +411,6 @@

	struct root_hold_token root_mount_hold(const char identifier);
	void root_mount_rel(struct root_hold_token *h);
	-void root_mount_wait(void);
	int root_mounted(void);