svn commit: r303254 - in stable: 10 10/share/man/man9 10/sys/sys 9 9/share/man/man9 9/sys/sys

[John Baldwin]

Author: jhb
Date: Sun Jul 24 04:38:50 2016
New Revision: 303254
URL: https://svnweb.freebsd.org/changeset/base/303254

Log:
  MFC 300253: Remove dangling references to rman_await_resource().
  
  This function was removed when RF_TIMESHARE was removed a couple of years
  ago.

Modified:
  stable/9/ObsoleteFiles.inc   (contents, props changed)
  stable/9/share/man/man9/Makefile
  stable/9/share/man/man9/rman.9
  stable/9/sys/sys/rman.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/share/man/man9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/ObsoleteFiles.inc
  stable/10/share/man/man9/Makefile
  stable/10/share/man/man9/rman.9
  stable/10/sys/sys/rman.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/ObsoleteFiles.inc
==============================================================================
--- stable/9/ObsoleteFiles.inc	Sun Jul 24 01:31:41 2016	(r303253)
+++ stable/9/ObsoleteFiles.inc	Sun Jul 24 04:38:50 2016	(r303254)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160723: stale MLINK removed
+OLD_FILES+=usr/share/man/man9/rman_await_resource.9.gz
 # 20151025: remove links to removed/unimplemented mbuf(9) macros
 OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz

Modified: stable/9/share/man/man9/Makefile
==============================================================================
--- stable/9/share/man/man9/Makefile	Sun Jul 24 01:31:41 2016	(r303253)
+++ stable/9/share/man/man9/Makefile	Sun Jul 24 04:38:50 2016	(r303254)
@@ -1035,7 +1035,6 @@ MLINKS+=resource_int_value.9 resource_lo
 	resource_int_value.9 resource_string_value.9
 MLINKS+=rman.9 rman_activate_resource.9 \
 	rman.9 rman_adjust_resource.9 \
-	rman.9 rman_await_resource.9 \
 	rman.9 rman_deactivate_resource.9 \
 	rman.9 rman_fini.9 \
 	rman.9 rman_first_free_region.9 \

Modified: stable/9/share/man/man9/rman.9
==============================================================================
--- stable/9/share/man/man9/rman.9	Sun Jul 24 01:31:41 2016	(r303253)
+++ stable/9/share/man/man9/rman.9	Sun Jul 24 04:38:50 2016	(r303254)
@@ -25,14 +25,13 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 15, 2014
+.Dd May 19, 2016
 .Dt RMAN 9
 .Os
 .Sh NAME
 .Nm rman ,
 .Nm rman_activate_resource ,
 .Nm rman_adjust_resource ,
-.Nm rman_await_resource ,
 .Nm rman_deactivate_resource ,
 .Nm rman_fini ,
 .Nm rman_init ,
@@ -67,8 +66,6 @@
 .Ft int
 .Fn rman_adjust_resource "struct resource *r" "u_long start" "u_long end"
 .Ft int
-.Fn rman_await_resource "struct resource *r" "int pri2" "int timo"
-.Ft int
 .Fn rman_deactivate_resource "struct resource *r"
 .Ft int
 .Fn rman_fini "struct rman *rm"
@@ -387,23 +384,6 @@ flag.
 If other consumers are waiting for this range, it will wakeup their threads.
 .Pp
 The
-.Fn rman_await_resource
-function performs an asynchronous wait for a resource
-.Fa r
-to become inactive, that is, for the
-.Dv RF_ACTIVE
-flag to be cleared.
-It is used to enable cooperative sharing of a resource
-which can only be safely used by one thread at a time.
-The arguments
-.Fa pri
-and
-.Fa timo
-are passed to the
-.Fn rman_await_resource
-function.
-.Pp
-The
 .Fn rman_get_start ,
 .Fn rman_get_end ,
 .Fn rman_get_size ,

Modified: stable/9/sys/sys/rman.h
==============================================================================
--- stable/9/sys/sys/rman.h	Sun Jul 24 01:31:41 2016	(r303253)
+++ stable/9/sys/sys/rman.h	Sun Jul 24 04:38:50 2016	(r303254)
@@ -117,7 +117,6 @@ TAILQ_HEAD(rman_head, rman);
 
 int	rman_activate_resource(struct resource *r);
 int	rman_adjust_resource(struct resource *r, u_long start, u_long end);
-int	rman_await_resource(struct resource *r, int pri, int timo);
 int	rman_first_free_region(struct rman *rm, u_long *start, u_long *end);
 bus_space_handle_t rman_get_bushandle(struct resource *);
 bus_space_tag_t rman_get_bustag(struct resource *);