Centralize the "bootdev" and "dumpdev" variables. They are still pretty

bogus all things considered, but at least now they don't camouflage as
being MD variables.

9 files changed, 3 insertions, 17 deletions

diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index de55fe5..c7b1cc5 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -71,9 +71,6 @@ device_t isa_bus_device = 0;
 
 extern int nfs_diskless_valid;		/* XXX use include file */
 
-dev_t	rootdev = NODEV;
-dev_t	dumpdev = NODEV;
-
 static void
 configure_start()
 {
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 232f629..d8d7b4f 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -105,9 +105,6 @@ SYSINIT(configure2, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL);
 /* SI_ORDER_MIDDLE is hookable */
 SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
 
-dev_t	rootdev = NODEV;
-dev_t	dumpdev = NODEV;
-
 device_t nexus_dev;
 
 /*
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 232f629..d8d7b4f 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -105,9 +105,6 @@ SYSINIT(configure2, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL);
 /* SI_ORDER_MIDDLE is hookable */
 SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
 
-dev_t	rootdev = NODEV;
-dev_t	dumpdev = NODEV;
-
 device_t nexus_dev;
 
 /*
diff --git a/sys/ia64/ia64/autoconf.c b/sys/ia64/ia64/autoconf.c
index d3a166b..c112d99 100644
--- a/sys/ia64/ia64/autoconf.c
+++ b/sys/ia64/ia64/autoconf.c
@@ -64,9 +64,6 @@ device_t isa_bus_device = 0;
 
 extern int nfs_diskless_valid;		/* XXX use include file */
 
-dev_t	rootdev = NODEV;
-dev_t	dumpdev = NODEV;
-
 /*
  * Determine i/o configuration for a machine.
  */
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 1249391..80cb9e6 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -117,6 +117,7 @@ watchdog_tickle_fn wdog_tickler = NULL;
 const char *panicstr;
 
 int dumping;				 /* system is dumping */
+dev_t dumpdev = NODEV;
 
 static void boot(int) __dead2;
 static void dumpsys(void);
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 0f1ab00..2e5360a5 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -94,6 +94,7 @@ static void	gets(char *cp);
 /* legacy find-root code */
 char		*rootdevnames[2] = {NULL, NULL};
 static int	setrootbyname(char *name);
+dev_t		rootdev = NODEV;
 
 /*
  * Find and mount the root filesystem
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 0f1ab00..2e5360a5 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -94,6 +94,7 @@ static void	gets(char *cp);
 /* legacy find-root code */
 char		*rootdevnames[2] = {NULL, NULL};
 static int	setrootbyname(char *name);
+dev_t		rootdev = NODEV;
 
 /*
  * Find and mount the root filesystem
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c
index 3c016ef..d010ebd 100644
--- a/sys/powerpc/powerpc/autoconf.c
+++ b/sys/powerpc/powerpc/autoconf.c
@@ -61,9 +61,6 @@ static const char rcsid[] =
 static void	configure(void *);
 SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL)
 
-dev_t	rootdev = NODEV;
-dev_t	dumpdev = NODEV;
-
 /*
  * Determine i/o configuration for a machine.
  */
diff --git a/sys/sparc64/sparc64/autoconf.c b/sys/sparc64/sparc64/autoconf.c
index a105183..f3475e1 100644
--- a/sys/sparc64/sparc64/autoconf.c
+++ b/sys/sparc64/sparc64/autoconf.c
@@ -42,8 +42,6 @@
 extern device_t isa_bus_device;
 #endif
 
-dev_t dumpdev = NODEV;
-dev_t rootdev = NODEV;
 static device_t nexusdev;
 
 static void configure(void *);