diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2015-01-22 11:12:42 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2015-01-22 11:12:42 +0000 |
| commit | a115fb62edf8946c09ae3b4cebe097efb7ea3e38 (patch) | |
| tree | 499d9197fe4fbf2671c76f17e92abf2f0cf51d05 /sys/kern/kern_lock.c | |
| parent | 2decd8fc810d0599227ed484e1510e840031fda7 (diff) | |
| download | src-a115fb62edf8946c09ae3b4cebe097efb7ea3e38.tar.gz src-a115fb62edf8946c09ae3b4cebe097efb7ea3e38.zip | |
Revert for r277213:
FreeBSD developers need more time to review patches in the surrounding
areas like the TCP stack which are using MPSAFE callouts to restore
distribution of callouts on multiple CPUs.
Bump the __FreeBSD_version instead of reverting it.
Suggested by: kmacy, adrian, glebius and kib
Differential Revision: https://reviews.freebsd.org/D1438
Notes
Notes:
svn path=/head/; revision=277528
Diffstat (limited to 'sys/kern/kern_lock.c')
| -rw-r--r-- | sys/kern/kern_lock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 38c870709c31..36a8470d2971 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -210,11 +210,9 @@ sleeplk(struct lock *lk, u_int flags, struct lock_object *ilk, GIANT_SAVE(); sleepq_add(&lk->lock_object, NULL, wmesg, SLEEPQ_LK | (catch ? SLEEPQ_INTERRUPTIBLE : 0), queue); - if ((flags & LK_TIMELOCK) && timo) { - sleepq_release(&lk->lock_object); + if ((flags & LK_TIMELOCK) && timo) sleepq_set_timeout(&lk->lock_object, timo); - sleepq_lock(&lk->lock_object); - } + /* * Decisional switch for real sleeping. */ |