svn commit: r285173 - head/share/man/man9

[Konstantin Belousov]

Author: kib
Date: Sun Jul  5 19:29:24 2015
New Revision: 285173
URL: https://svnweb.freebsd.org/changeset/base/285173

Log:
  Document the locking context for the directly dispatched callouts.
  Cross-reference timeout(9).
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/share/man/man9/locking.9

Modified: head/share/man/man9/locking.9
==============================================================================
--- head/share/man/man9/locking.9	Sun Jul  5 19:05:16 2015	(r285172)
+++ head/share/man/man9/locking.9	Sun Jul  5 19:29:24 2015	(r285173)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 2013
+.Dd July 5, 2015
 .Dt LOCKING 9
 .Os
 .Sh NAME
@@ -387,6 +387,7 @@ At this time this is a rather easy to re
 .It interrupt filter:  Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no
 .It interrupt thread:  Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no
 .It callout:    Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no
+.It direct callout:  Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no
 .It system call:    Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok
 .El
 .Sh SEE ALSO
@@ -401,7 +402,8 @@ At this time this is a rather easy to re
 .Xr rwlock 9 ,
 .Xr sema 9 ,
 .Xr sleep 9 ,
-.Xr sx 9
+.Xr sx 9 ,
+.Xr timeout 9
 .Sh HISTORY
 These
 functions appeared in