Revert the previous revision for two reasons:

• I can't seem to reproduce the warning I got from WITNESS anymore.
• The fix was wrong. Since a uidinfo struct is a member of proc, it makes sense for the locking order to be such that you are allowed to hold proc and then grab the uidinfo lock.