D38004.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D38004.diff
View Options

	diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h
	--- a/stand/common/bootstrap.h
	+++ b/stand/common/bootstrap.h
	@@ -381,8 +381,6 @@
	/* This must be provided by the MD code, but should it be in the archsw? */
	void delay(int delay);

	-void dev_cleanup(void);
	-
	/*
	* nvstore API.
	*/
	diff --git a/stand/common/misc.c b/stand/common/misc.c
	--- a/stand/common/misc.c
	+++ b/stand/common/misc.c
	@@ -169,17 +169,6 @@
	return (buf);
	}

	-void
	-dev_cleanup(void)
	-{
	- int i;
	-
	- /* Call cleanup routines */
	- for (i = 0; devsw[i] != NULL; ++i)
	- if (devsw[i]->dv_cleanup != NULL)
	- (devsw[i]->dv_cleanup)();
	-}
	-
	/*
	* mount new rootfs and unmount old, set "currdev" environment variable.
	*/
	diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c
	--- a/stand/libsa/dev.c
	+++ b/stand/libsa/dev.c
	@@ -172,3 +172,14 @@
	}
	return (err);
	}
	+
	+void
	+dev_cleanup(void)
	+{
	+ int i;
	+
	+ /* Call cleanup routines */
	+ for (i = 0; devsw[i] != NULL; ++i)
	+ if (devsw[i]->dv_cleanup != NULL)
	+ (devsw[i]->dv_cleanup)();
	+}
	diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h
	--- a/stand/libsa/stand.h
	+++ b/stand/libsa/stand.h
	@@ -193,6 +193,7 @@
	char devformat(struct devdesc d);
	int devparse(struct devdesc *, const char , const char **);
	int devinit(void);
	+void dev_cleanup(void);

	struct open_file {
	int f_flags; /* see F_* below */