diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-04-03 19:46:12 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-04-03 19:46:12 +0000 |
| commit | fe5458f66537db2116edb0ad1cfa8b9da5fb1ba3 (patch) | |
| tree | 55afba560e3d37dfdc20bbbb68db00bf16a00f1d /sys/dev | |
| parent | d8382f158111ab26e940097a0ca91abe5de5035a (diff) | |
| download | FreeBSD-src-fe5458f66537db2116edb0ad1cfa8b9da5fb1ba3.zip FreeBSD-src-fe5458f66537db2116edb0ad1cfa8b9da5fb1ba3.tar.gz | |
Add a how argument to root_mount_hold() so it can be passed NOWAIT and be called
in situations where sleeping isnt allowed.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pccbb/pccbb_pci.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/controller/usb_controller.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c index c89e5ad..4fcd7ea 100644 --- a/sys/dev/pccbb/pccbb_pci.c +++ b/sys/dev/pccbb/pccbb_pci.c @@ -439,7 +439,7 @@ cbb_pci_attach(device_t brdev) device_printf(brdev, "unable to create event thread.\n"); panic("cbb_create_event_thread"); } - sc->sc_root_token = root_mount_hold(device_get_nameunit(sc->dev)); + sc->sc_root_token = root_mount_hold(device_get_nameunit(sc->dev), M_WAITOK); return (0); err: if (sc->irq_res) diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index fc31f15..bea3e77 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -115,7 +115,7 @@ usb2_attach(device_t dev) } /* delay vfs_mountroot until the bus is explored */ - bus->bus_roothold = root_mount_hold(device_get_nameunit(dev)); + bus->bus_roothold = root_mount_hold(device_get_nameunit(dev), M_WAITOK); if (usb2_post_init_called) { mtx_lock(&Giant); |
