diff options
| author |   kettenis <kettenis@openbsd.org> | 2007-08-07 21:20:54 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2007-08-07 21:20:54 +0000 |
| commit | e8dd11dfee9be4ff80ec4c59bfc2f405b9c3ec57 (patch) | |
| tree | 1ef208b1991a855ab1b0741a7ebea236bfd45d0f | |
| parent | m_priv_req_readdir(): check file type after fstat, since d_type (diff) | |
| download | wireguard-openbsd-e8dd11dfee9be4ff80ec4c59bfc2f405b9c3ec57.tar.xz wireguard-openbsd-e8dd11dfee9be4ff80ec4c59bfc2f405b9c3ec57.zip | |
Add "dma" and "ledma" as busses that potentially have the root device on them.
Makes the Ultra-1 find its root disk again.
tested by nick@ and fgsch@, ok deraadt@
| -rw-r--r-- | sys/arch/sparc64/sparc64/autoconf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index 6d6a352ee1b..50a1efae1e2 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.68 2007/07/29 20:22:07 kettenis Exp $ */ +/* $OpenBSD: autoconf.c,v 1.69 2007/08/07 21:20:54 kettenis Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -1042,10 +1042,11 @@ device_register(struct device *dev, void *aux) busname = busdev->dv_cfdata->cf_driver->cd_name; if (strcmp(busname, "mainbus") == 0 || strcmp(busname, "upa") == 0) node = ma->ma_node; + else if (strcmp(busname, "sbus") == 0 || + strcmp(busname, "dma") == 0 || strcmp(busname, "ledma") == 0) + node = sa->sa_node; else if (strcmp(busname, "pci") == 0) node = PCITAG_NODE(pa->pa_tag); - else if (strcmp(busname, "sbus") == 0) - node = sa->sa_node; if (node == bootnode) { nail_bootdev(dev, bp); |