Partially revert 3779537e: change cv_wait_interruptible back to cv_wait.

This fixes a build problem in zfs, which uses cv_wait_interruptible.  Since
cv_wait itself is modified in condvar.h, just use it directly here.