svn commit: r254865 - head/sys/dev/drm2/ttm

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Sun Aug 25 14:53:39 2013
New Revision: 254865
URL: http://svnweb.freebsd.org/changeset/base/254865

Log:
  drm/ttm: Import Linux commit cc4c0c4de3c775be22072ec3251f2e581b63d9a0
  
  Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
  Date:   Tue Jan 15 14:57:28 2013 +0100
  
      drm/ttm: unexport ttm_bo_wait_unreserved
  
      All legitimate users of this function outside ttm_bo.c are gone, now
      it's only an implementation detail.
  
      Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
      Reviewed-by: Jerome Glisse <jglisse at redhat.com>
  
  Approved by:	kib@

Modified:
  head/sys/dev/drm2/ttm/ttm_bo.c
  head/sys/dev/drm2/ttm/ttm_bo_driver.h

Modified: head/sys/dev/drm2/ttm/ttm_bo.c
==============================================================================
--- head/sys/dev/drm2/ttm/ttm_bo.c	Sun Aug 25 14:52:20 2013	(r254864)
+++ head/sys/dev/drm2/ttm/ttm_bo.c	Sun Aug 25 14:53:39 2013	(r254865)
@@ -131,7 +131,7 @@ static void ttm_bo_release_list(struct t
 	ttm_mem_global_free(bdev->glob->mem_glob, acc_size);
 }
 
-int
+static int
 ttm_bo_wait_unreserved_locked(struct ttm_buffer_object *bo, bool interruptible)
 {
 	const char *wmsg;

Modified: head/sys/dev/drm2/ttm/ttm_bo_driver.h
==============================================================================
--- head/sys/dev/drm2/ttm/ttm_bo_driver.h	Sun Aug 25 14:52:20 2013	(r254864)
+++ head/sys/dev/drm2/ttm/ttm_bo_driver.h	Sun Aug 25 14:53:39 2013	(r254865)
@@ -899,18 +899,6 @@ extern void ttm_bo_unreserve(struct ttm_
  */
 extern void ttm_bo_unreserve_locked(struct ttm_buffer_object *bo);
 
-/**
- * ttm_bo_wait_unreserved
- *
- * @bo: A pointer to a struct ttm_buffer_object.
- *
- * Wait for a struct ttm_buffer_object to become unreserved.
- * This is typically used in the execbuf code to relax cpu-usage when
- * a potential deadlock condition backoff.
- */
-extern int ttm_bo_wait_unreserved_locked(struct ttm_buffer_object *bo,
-				  bool interruptible);
-
 /*
  * ttm_bo_util.c
  */