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.
This commit is contained in:
parent
ab5c6c352c
commit
3b38901a06
@ -71,9 +71,6 @@ device_t isa_bus_device = 0;
|
|||||||
|
|
||||||
extern int nfs_diskless_valid; /* XXX use include file */
|
extern int nfs_diskless_valid; /* XXX use include file */
|
||||||
|
|
||||||
dev_t rootdev = NODEV;
|
|
||||||
dev_t dumpdev = NODEV;
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
configure_start()
|
configure_start()
|
||||||
{
|
{
|
||||||
|
@ -105,9 +105,6 @@ SYSINIT(configure2, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL);
|
|||||||
/* SI_ORDER_MIDDLE is hookable */
|
/* SI_ORDER_MIDDLE is hookable */
|
||||||
SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
|
SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
|
||||||
|
|
||||||
dev_t rootdev = NODEV;
|
|
||||||
dev_t dumpdev = NODEV;
|
|
||||||
|
|
||||||
device_t nexus_dev;
|
device_t nexus_dev;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -105,9 +105,6 @@ SYSINIT(configure2, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL);
|
|||||||
/* SI_ORDER_MIDDLE is hookable */
|
/* SI_ORDER_MIDDLE is hookable */
|
||||||
SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
|
SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
|
||||||
|
|
||||||
dev_t rootdev = NODEV;
|
|
||||||
dev_t dumpdev = NODEV;
|
|
||||||
|
|
||||||
device_t nexus_dev;
|
device_t nexus_dev;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -64,9 +64,6 @@ device_t isa_bus_device = 0;
|
|||||||
|
|
||||||
extern int nfs_diskless_valid; /* XXX use include file */
|
extern int nfs_diskless_valid; /* XXX use include file */
|
||||||
|
|
||||||
dev_t rootdev = NODEV;
|
|
||||||
dev_t dumpdev = NODEV;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Determine i/o configuration for a machine.
|
* Determine i/o configuration for a machine.
|
||||||
*/
|
*/
|
||||||
|
@ -117,6 +117,7 @@ watchdog_tickle_fn wdog_tickler = NULL;
|
|||||||
const char *panicstr;
|
const char *panicstr;
|
||||||
|
|
||||||
int dumping; /* system is dumping */
|
int dumping; /* system is dumping */
|
||||||
|
dev_t dumpdev = NODEV;
|
||||||
|
|
||||||
static void boot(int) __dead2;
|
static void boot(int) __dead2;
|
||||||
static void dumpsys(void);
|
static void dumpsys(void);
|
||||||
|
@ -94,6 +94,7 @@ static void gets(char *cp);
|
|||||||
/* legacy find-root code */
|
/* legacy find-root code */
|
||||||
char *rootdevnames[2] = {NULL, NULL};
|
char *rootdevnames[2] = {NULL, NULL};
|
||||||
static int setrootbyname(char *name);
|
static int setrootbyname(char *name);
|
||||||
|
dev_t rootdev = NODEV;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Find and mount the root filesystem
|
* Find and mount the root filesystem
|
||||||
|
@ -94,6 +94,7 @@ static void gets(char *cp);
|
|||||||
/* legacy find-root code */
|
/* legacy find-root code */
|
||||||
char *rootdevnames[2] = {NULL, NULL};
|
char *rootdevnames[2] = {NULL, NULL};
|
||||||
static int setrootbyname(char *name);
|
static int setrootbyname(char *name);
|
||||||
|
dev_t rootdev = NODEV;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Find and mount the root filesystem
|
* Find and mount the root filesystem
|
||||||
|
@ -61,9 +61,6 @@ static const char rcsid[] =
|
|||||||
static void configure(void *);
|
static void configure(void *);
|
||||||
SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL)
|
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.
|
* Determine i/o configuration for a machine.
|
||||||
*/
|
*/
|
||||||
|
@ -42,8 +42,6 @@
|
|||||||
extern device_t isa_bus_device;
|
extern device_t isa_bus_device;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
dev_t dumpdev = NODEV;
|
|
||||||
dev_t rootdev = NODEV;
|
|
||||||
static device_t nexusdev;
|
static device_t nexusdev;
|
||||||
|
|
||||||
static void configure(void *);
|
static void configure(void *);
|
||||||
|
Loading…
Reference in New Issue
Block a user