diff options
author | attilio <attilio@FreeBSD.org> | 2013-02-26 21:13:09 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2013-02-26 21:13:09 +0000 |
commit | 9d00dd1afe2f593eecea6d299d65974c09cb6871 (patch) | |
tree | 4a3f797e0861a89600c54d8b0e6f78fdfe1ff7d2 /sys | |
parent | 134623836d0dcb10f5bc79c883bd239098952cca (diff) | |
download | FreeBSD-src-9d00dd1afe2f593eecea6d299d65974c09cb6871.zip FreeBSD-src-9d00dd1afe2f593eecea6d299d65974c09cb6871.tar.gz |
MFC
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arm/arm/mp_machdep.c | 8 | ||||
-rw-r--r-- | sys/arm/arm/vfp.c | 7 | ||||
-rw-r--r-- | sys/arm/include/vfp.h | 1 | ||||
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c | 6 | ||||
-rw-r--r-- | sys/dev/cpufreq/ichss.c | 21 | ||||
-rw-r--r-- | sys/dev/cxgbe/common/common.h | 5 | ||||
-rw-r--r-- | sys/dev/cxgbe/t4_main.c | 178 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_soft.c | 9 | ||||
-rw-r--r-- | sys/dev/random/randomdev_soft.c | 2 | ||||
-rw-r--r-- | sys/kern/kern_clock.c | 5 | ||||
-rw-r--r-- | sys/kern/kern_clocksource.c | 24 | ||||
-rw-r--r-- | sys/sys/time.h | 5 | ||||
-rw-r--r-- | sys/vm/vm_object.c | 2 | ||||
-rw-r--r-- | sys/vm/vnode_pager.c | 4 |
14 files changed, 187 insertions, 90 deletions
diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c index 30e6b63..6337b9c 100644 --- a/sys/arm/arm/mp_machdep.c +++ b/sys/arm/arm/mp_machdep.c @@ -49,6 +49,9 @@ __FBSDID("$FreeBSD$"); #include <machine/pte.h> #include <machine/intr.h> #include <machine/vmparam.h> +#ifdef ARM_VFP_SUPPORT +#include <machine/vfp.h> +#endif #include "opt_smp.h" @@ -181,6 +184,11 @@ init_secondary(int cpu) KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); pc->pc_curthread = pc->pc_idlethread; pc->pc_curpcb = pc->pc_idlethread->td_pcb; +#ifdef ARM_VFP_SUPPORT + pc->pc_cpu = cpu; + + vfp_init(); +#endif mtx_lock_spin(&ap_boot_mtx); diff --git a/sys/arm/arm/vfp.c b/sys/arm/arm/vfp.c index bde566c..c163af0 100644 --- a/sys/arm/arm/vfp.c +++ b/sys/arm/arm/vfp.c @@ -43,7 +43,6 @@ unsigned int get_coprocessorACR(void); int vfp_bounce(u_int, u_int, struct trapframe *, int); void vfp_discard(void); void vfp_enable(void); -void vfp_init(void); void vfp_restore(struct vfp_state *); void vfp_store(struct vfp_state *); void set_coprocessorACR(u_int); @@ -74,8 +73,8 @@ void set_coprocessorACR(u_int val) { __asm __volatile("mcr p15, 0, %0, c1, c0, 2\n\t" - "isb\n\t" : : "r" (val) : "cc"); + isb(); } @@ -140,7 +139,7 @@ vfp_bounce(u_int addr, u_int insn, struct trapframe *frame, int code) #ifdef SMP /* don't save if newer registers are on another processor */ if (vfptd /* && (vfptd == curthread) */ && - (vfptd->td_pcb->pcb_vfpcpu == PCPU_GET(vfpcpu)) + (vfptd->td_pcb->pcb_vfpcpu == PCPU_GET(cpu))) #else /* someone did not save their registers, */ if (vfptd /* && (vfptd == curthread) */) @@ -168,7 +167,7 @@ vfp_bounce(u_int addr, u_int insn, struct trapframe *frame, int code) */ vfp_restore(&curpcb->pcb_vfpstate); #ifdef SMP - curpcb->pcb_cpu = PCPU_GET(cpu); + curpcb->pcb_vfpcpu = PCPU_GET(cpu); #endif PCPU_SET(vfpcthread, PCPU_GET(curthread)); return 0; diff --git a/sys/arm/include/vfp.h b/sys/arm/include/vfp.h index 618f491..94c24a9 100644 --- a/sys/arm/include/vfp.h +++ b/sys/arm/include/vfp.h @@ -124,5 +124,6 @@ #define COPROC10 (0x3 << 20) #define COPROC11 (0x3 << 22) +void vfp_init(void); #endif diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c index 17cb6c1..59b461b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c @@ -23,6 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved. */ #include <sys/zfs_context.h> @@ -3205,7 +3206,10 @@ vdev_deadman(vdev_t *vd) fio->io_timestamp, delta, vq->vq_io_complete_ts); fm_panic("I/O to pool '%s' appears to be " - "hung.", spa_name(spa)); + "hung on vdev guid %llu at '%s'.", + spa_name(spa), + (long long unsigned int) vd->vdev_guid, + vd->vdev_path); } } mutex_exit(&vq->vq_lock); diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c index 0eae0c9..101b576 100644 --- a/sys/dev/cpufreq/ichss.c +++ b/sys/dev/cpufreq/ichss.c @@ -67,7 +67,7 @@ struct ichss_softc { #define PCI_DEV_82801BA 0x244c /* ICH2M */ #define PCI_DEV_82801CA 0x248c /* ICH3M */ #define PCI_DEV_82801DB 0x24cc /* ICH4M */ -#define PCI_DEV_82815BA 0x1130 /* Unsupported/buggy part */ +#define PCI_DEV_82815_MC 0x1130 /* Unsupported/buggy part */ /* PCI config registers for finding PMBASE and enabling SpeedStep. */ #define ICHSS_PMBASE_OFFSET 0x40 @@ -155,9 +155,6 @@ ichss_identify(driver_t *driver, device_t parent) * E.g. see Section 6.1 "PCI Devices and Functions" and table 6.1 of * Intel(r) 82801BA I/O Controller Hub 2 (ICH2) and Intel(r) 82801BAM * I/O Controller Hub 2 Mobile (ICH2-M). - * - * TODO: add a quirk to disable if we see the 82815_MC along - * with the 82801BA and revision < 5. */ ich_device = pci_find_bsf(0, 0x1f, 0); if (ich_device == NULL || @@ -167,6 +164,22 @@ ichss_identify(driver_t *driver, device_t parent) pci_get_device(ich_device) != PCI_DEV_82801DB)) return; + /* + * Certain systems with ICH2 and an Intel 82815_MC host bridge + * where the host bridge's revision is < 5 lockup if SpeedStep + * is used. + */ + if (pci_get_device(ich_device) == PCI_DEV_82801BA) { + device_t hostb; + + hostb = pci_find_bsf(0, 0, 0); + if (hostb != NULL && + pci_get_vendor(hostb) == PCI_VENDOR_INTEL && + pci_get_device(hostb) == PCI_DEV_82815_MC && + pci_get_revid(hostb) < 5) + return; + } + /* Find the PMBASE register from our PCI config header. */ pmbase = pci_read_config(ich_device, ICHSS_PMBASE_OFFSET, sizeof(pmbase)); diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h index abc9422..ccd1195 100644 --- a/sys/dev/cxgbe/common/common.h +++ b/sys/dev/cxgbe/common/common.h @@ -68,6 +68,11 @@ enum { #define FW_VERSION_MICRO 4 #define FW_VERSION_BUILD 0 +#define FW_VERSION (V_FW_HDR_FW_VER_MAJOR(FW_VERSION_MAJOR) | \ + V_FW_HDR_FW_VER_MINOR(FW_VERSION_MINOR) | \ + V_FW_HDR_FW_VER_MICRO(FW_VERSION_MICRO) | \ + V_FW_HDR_FW_VER_BUILD(FW_VERSION_BUILD)) + struct port_stats { u64 tx_octets; /* total # of octets in good frames */ u64 tx_frames; /* all good frames */ diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index da3accd..fcea547 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -213,6 +213,13 @@ static char t4_cfg_file[32] = "default"; TUNABLE_STR("hw.cxgbe.config_file", t4_cfg_file, sizeof(t4_cfg_file)); /* + * Firmware auto-install by driver during attach (0, 1, 2 = prohibited, allowed, + * encouraged respectively). + */ +static unsigned int t4_fw_install = 1; +TUNABLE_INT("hw.cxgbe.fw_install", &t4_fw_install); + +/* * ASIC features that will be used. Disable the ones you don't want so that the * chip resources aren't wasted on features that will not be used. */ @@ -1503,6 +1510,33 @@ allocate: } /* + * Is the given firmware compatible with the one the driver was compiled with? + */ +static int +fw_compatible(const struct fw_hdr *hdr) +{ + + if (hdr->fw_ver == htonl(FW_VERSION)) + return (1); + + /* + * XXX: Is this too conservative? Perhaps I should limit this to the + * features that are supported in the driver. + */ + if (hdr->intfver_nic == FW_HDR_INTFVER_NIC && + hdr->intfver_vnic == FW_HDR_INTFVER_VNIC && + hdr->intfver_ofld == FW_HDR_INTFVER_OFLD && + hdr->intfver_ri == FW_HDR_INTFVER_RI && + hdr->intfver_iscsipdu == FW_HDR_INTFVER_ISCSIPDU && + hdr->intfver_iscsi == FW_HDR_INTFVER_ISCSI && + hdr->intfver_fcoepdu == FW_HDR_INTFVER_FCOEPDU && + hdr->intfver_fcoe == FW_HDR_INTFVER_FCOEPDU) + return (1); + + return (0); +} + +/* * Install a compatible firmware (if required), establish contact with it (by * saying hello), and reset the device. If we end up as the master driver, * partition adapter resources by providing a configuration file to the @@ -1512,84 +1546,99 @@ static int prep_firmware(struct adapter *sc) { const struct firmware *fw = NULL, *cfg = NULL, *default_cfg; - int rc; + int rc, card_fw_usable, kld_fw_usable; enum dev_state state; + struct fw_hdr *card_fw; + const struct fw_hdr *kld_fw; default_cfg = firmware_get(T4_CFGNAME); - /* Check firmware version and install a different one if necessary */ - rc = t4_check_fw_version(sc); - snprintf(sc->fw_version, sizeof(sc->fw_version), "%u.%u.%u.%u", - G_FW_HDR_FW_VER_MAJOR(sc->params.fw_vers), - G_FW_HDR_FW_VER_MINOR(sc->params.fw_vers), - G_FW_HDR_FW_VER_MICRO(sc->params.fw_vers), - G_FW_HDR_FW_VER_BUILD(sc->params.fw_vers)); - if (rc != 0) { - uint32_t v = 0; + /* Read the header of the firmware on the card */ + card_fw = malloc(sizeof(*card_fw), M_CXGBE, M_ZERO | M_WAITOK); + rc = -t4_read_flash(sc, FLASH_FW_START, + sizeof (*card_fw) / sizeof (uint32_t), (uint32_t *)card_fw, 1); + if (rc == 0) + card_fw_usable = fw_compatible((const void*)card_fw); + else { + device_printf(sc->dev, + "Unable to read card's firmware header: %d\n", rc); + card_fw_usable = 0; + } - fw = firmware_get(T4_FWNAME); - if (fw != NULL) { - const struct fw_hdr *hdr = (const void *)fw->data; + /* This is the firmware in the KLD */ + fw = firmware_get(T4_FWNAME); + if (fw != NULL) { + kld_fw = (const void *)fw->data; + kld_fw_usable = fw_compatible(kld_fw); + } else { + kld_fw = NULL; + kld_fw_usable = 0; + } - v = ntohl(hdr->fw_ver); + /* + * Short circuit for the common case: the firmware on the card is an + * exact match and the KLD is an exact match too, or it's + * absent/incompatible, or we're prohibited from using it. Note that + * t4_fw_install = 2 is ignored here -- use cxgbetool loadfw if you want + * to reinstall the same firmware as the one on the card. + */ + if (card_fw_usable && card_fw->fw_ver == htonl(FW_VERSION) && + (!kld_fw_usable || kld_fw->fw_ver == htonl(FW_VERSION) || + t4_fw_install == 0)) + goto hello; - /* - * The firmware module will not be used if it isn't the - * same major version as what the driver was compiled - * with. - */ - if (G_FW_HDR_FW_VER_MAJOR(v) != FW_VERSION_MAJOR) { - device_printf(sc->dev, - "Found firmware image but version %d " - "can not be used with this driver (%d)\n", - G_FW_HDR_FW_VER_MAJOR(v), FW_VERSION_MAJOR); + if (kld_fw_usable && (!card_fw_usable || + ntohl(kld_fw->fw_ver) > ntohl(card_fw->fw_ver) || + (t4_fw_install == 2 && kld_fw->fw_ver != card_fw->fw_ver))) { + uint32_t v = ntohl(kld_fw->fw_ver); - firmware_put(fw, FIRMWARE_UNLOAD); - fw = NULL; - } - } + device_printf(sc->dev, + "installing firmware %d.%d.%d.%d on card.\n", + G_FW_HDR_FW_VER_MAJOR(v), G_FW_HDR_FW_VER_MINOR(v), + G_FW_HDR_FW_VER_MICRO(v), G_FW_HDR_FW_VER_BUILD(v)); - if (fw == NULL && rc < 0) { - device_printf(sc->dev, "No usable firmware. " - "card has %d.%d.%d, driver compiled with %d.%d.%d", - G_FW_HDR_FW_VER_MAJOR(sc->params.fw_vers), - G_FW_HDR_FW_VER_MINOR(sc->params.fw_vers), - G_FW_HDR_FW_VER_MICRO(sc->params.fw_vers), - FW_VERSION_MAJOR, FW_VERSION_MINOR, - FW_VERSION_MICRO); - rc = EAGAIN; + rc = -t4_load_fw(sc, fw->data, fw->datasize); + if (rc != 0) { + device_printf(sc->dev, + "failed to install firmware: %d\n", rc); goto done; } - /* - * Always upgrade, even for minor/micro/build mismatches. - * Downgrade only for a major version mismatch or if - * force_firmware_install was specified. - */ - if (fw != NULL && (rc < 0 || v > sc->params.fw_vers)) { - device_printf(sc->dev, - "installing firmware %d.%d.%d.%d on card.\n", - G_FW_HDR_FW_VER_MAJOR(v), G_FW_HDR_FW_VER_MINOR(v), - G_FW_HDR_FW_VER_MICRO(v), G_FW_HDR_FW_VER_BUILD(v)); - - rc = -t4_load_fw(sc, fw->data, fw->datasize); - if (rc != 0) { - device_printf(sc->dev, - "failed to install firmware: %d\n", rc); - goto done; - } else { - /* refresh */ - (void) t4_check_fw_version(sc); - snprintf(sc->fw_version, - sizeof(sc->fw_version), "%u.%u.%u.%u", - G_FW_HDR_FW_VER_MAJOR(sc->params.fw_vers), - G_FW_HDR_FW_VER_MINOR(sc->params.fw_vers), - G_FW_HDR_FW_VER_MICRO(sc->params.fw_vers), - G_FW_HDR_FW_VER_BUILD(sc->params.fw_vers)); - } - } + /* Installed successfully, update the cached header too. */ + memcpy(card_fw, kld_fw, sizeof(*card_fw)); + card_fw_usable = 1; + } + + if (!card_fw_usable) { + uint32_t c, k; + + c = ntohl(card_fw->fw_ver); + k = kld_fw ? ntohl(kld_fw->fw_ver) : 0; + + device_printf(sc->dev, "Cannot find a usable firmware: " + "fw_install %d, driver compiled with %d.%d.%d.%d, " + "card has %d.%d.%d.%d, KLD has %d.%d.%d.%d\n", + t4_fw_install, + G_FW_HDR_FW_VER_MAJOR(FW_VERSION), + G_FW_HDR_FW_VER_MINOR(FW_VERSION), + G_FW_HDR_FW_VER_MICRO(FW_VERSION), + G_FW_HDR_FW_VER_BUILD(FW_VERSION), + G_FW_HDR_FW_VER_MAJOR(c), G_FW_HDR_FW_VER_MINOR(c), + G_FW_HDR_FW_VER_MICRO(c), G_FW_HDR_FW_VER_BUILD(c), + G_FW_HDR_FW_VER_MAJOR(k), G_FW_HDR_FW_VER_MINOR(k), + G_FW_HDR_FW_VER_MICRO(k), G_FW_HDR_FW_VER_BUILD(k)); + goto done; } +hello: + /* We're using whatever's on the card and it's known to be good. */ + sc->params.fw_vers = ntohl(card_fw->fw_ver); + snprintf(sc->fw_version, sizeof(sc->fw_version), "%u.%u.%u.%u", + G_FW_HDR_FW_VER_MAJOR(sc->params.fw_vers), + G_FW_HDR_FW_VER_MINOR(sc->params.fw_vers), + G_FW_HDR_FW_VER_MICRO(sc->params.fw_vers), + G_FW_HDR_FW_VER_BUILD(sc->params.fw_vers)); + /* Contact firmware. */ rc = t4_fw_hello(sc, sc->mbox, sc->mbox, MASTER_MAY, &state); if (rc < 0) { @@ -1639,6 +1688,7 @@ prep_firmware(struct adapter *sc) sc->flags |= FW_OK; done: + free(card_fw, M_CXGBE); if (fw != NULL) firmware_put(fw, FIRMWARE_UNLOAD); if (cfg != NULL) diff --git a/sys/dev/hwpmc/hwpmc_soft.c b/sys/dev/hwpmc/hwpmc_soft.c index 0ed2262..48e297e 100644 --- a/sys/dev/hwpmc/hwpmc_soft.c +++ b/sys/dev/hwpmc/hwpmc_soft.c @@ -45,6 +45,8 @@ __FBSDID("$FreeBSD$"); #define SOFT_CAPS (PMC_CAP_READ | PMC_CAP_WRITE | PMC_CAP_INTERRUPT | \ PMC_CAP_USER | PMC_CAP_SYSTEM) +PMC_SOFT_DECLARE( , , clock, prof); + struct soft_descr { struct pmc_descr pm_descr; /* "base class" */ }; @@ -125,6 +127,8 @@ soft_allocate_pmc(int cpu, int ri, struct pmc *pm, return (EINVAL); pmc_soft_ev_release(ps); + if (ev == pmc___clock_prof.ps_ev.pm_ev_code) + cpu_startprofclock(); return (0); } @@ -324,9 +328,8 @@ soft_release_pmc(int cpu, int ri, struct pmc *pmc) KASSERT(phw->phw_pmc == NULL, ("[soft,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); - /* - * Nothing to do. - */ + if (pmc->pm_event == pmc___clock_prof.ps_ev.pm_ev_code) + cpu_stopprofclock(); return (0); } diff --git a/sys/dev/random/randomdev_soft.c b/sys/dev/random/randomdev_soft.c index c720902..420a82a 100644 --- a/sys/dev/random/randomdev_soft.c +++ b/sys/dev/random/randomdev_soft.c @@ -391,7 +391,7 @@ random_yarrow_block(int flag) mtx_lock(&random_reseed_mtx); /* Blocking logic */ - while (random_systat.seeded && !error) { + while (!random_systat.seeded && !error) { if (flag & O_NONBLOCK) error = EWOULDBLOCK; else { diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 9d62c58..55a2bff 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$"); #include <sys/pmckern.h> PMC_SOFT_DEFINE( , , clock, hard); PMC_SOFT_DEFINE( , , clock, stat); +PMC_SOFT_DEFINE( , , clock, prof); #endif #ifdef DEVICE_POLLING @@ -817,6 +818,10 @@ profclock_cnt(int cnt, int usermode, uintfptr_t pc) } } #endif +#ifdef HWPMC_HOOKS + if (td->td_intr_frame != NULL) + PMC_SOFT_CALL_TF( , , clock, prof, td->td_intr_frame); +#endif } /* diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c index 6fd40a8..33f21e9 100644 --- a/sys/kern/kern_clocksource.c +++ b/sys/kern/kern_clocksource.c @@ -732,12 +732,15 @@ cpu_startprofclock(void) { ET_LOCK(); - if (periodic) { - configtimer(0); - profiling = 1; - configtimer(1); + if (profiling == 0) { + if (periodic) { + configtimer(0); + profiling = 1; + configtimer(1); + } else + profiling = 1; } else - profiling = 1; + profiling++; ET_UNLOCK(); } @@ -749,12 +752,15 @@ cpu_stopprofclock(void) { ET_LOCK(); - if (periodic) { - configtimer(0); + if (profiling == 1) { + if (periodic) { + configtimer(0); + profiling = 0; + configtimer(1); + } else profiling = 0; - configtimer(1); } else - profiling = 0; + profiling--; ET_UNLOCK(); } diff --git a/sys/sys/time.h b/sys/sys/time.h index 14b80e3..80878c0 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -156,6 +156,9 @@ timeval2bintime(const struct timeval *tv, struct bintime *bt) /* 18446744073709 = int(2^64 / 1000000) */ bt->frac = tv->tv_usec * (uint64_t)18446744073709LL; } +#endif /* __BSD_VISIBLE */ + +#ifdef _KERNEL /* Operations on timespecs */ #define timespecclear(tvp) ((tvp)->tv_sec = (tvp)->tv_nsec = 0) @@ -194,7 +197,7 @@ timeval2bintime(const struct timeval *tv, struct bintime *bt) /* timevaladd and timevalsub are not inlined */ -#endif /* __BSD_VISIBLE */ +#endif /* _KERNEL */ #ifndef _KERNEL /* NetBSD/OpenBSD compatible interfaces */ diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 4787c1b..e6ab25f 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1176,7 +1176,7 @@ shadowlookup: if (object != tobject) VM_OBJECT_UNLOCK(object); m->oflags |= VPO_WANTED; - VM_OBJECT_SLEEP(tobject, m, PDROP | PVM, "madvpo" , 0); + VM_OBJECT_SLEEP(tobject, m, PDROP | PVM, "madvpo", 0); VM_OBJECT_LOCK(object); goto relookup; } diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 1116e84..0169fa2 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -116,7 +116,7 @@ vnode_create_vobject(struct vnode *vp, off_t isize, struct thread *td) } VOP_UNLOCK(vp, 0); vm_object_set_flag(object, OBJ_DISCONNECTWNT); - VM_OBJECT_SLEEP(object, object, PDROP | PVM, "vodead" , 0); + VM_OBJECT_SLEEP(object, object, PDROP | PVM, "vodead", 0); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); } @@ -210,7 +210,7 @@ retry: if ((object->flags & OBJ_DEAD) == 0) break; vm_object_set_flag(object, OBJ_DISCONNECTWNT); - VM_OBJECT_SLEEP(object, object, PDROP | PVM, "vadead" , 0); + VM_OBJECT_SLEEP(object, object, PDROP | PVM, "vadead", 0); } if (vp->v_usecount == 0) |