summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-12-03 13:59:36 +1000
committerDave Airlie <airlied@redhat.com>2010-12-03 13:59:36 +1000
commita9979d6077e4482dbe64cedc4bb181d5576d13f7 (patch)
tree24e383df4e984b907651f79d3fb0642aa0691426 /include/linux
parent27641c3f003e7f3b6585c01d8a788883603eb262 (diff)
parent147666fb3b93b8c484f562da33a37f886ddff768 (diff)
downloadcachepc-linux-a9979d6077e4482dbe64cedc4bb181d5576d13f7.tar.gz
cachepc-linux-a9979d6077e4482dbe64cedc4bb181d5576d13f7.zip
Merge branch 'drm-ttm-next' into drm-core-next
* drm-ttm-next: drm/radeon: Use the ttm execbuf utilities drm/ttm: Fix up io_mem_reserve / io_mem_free calling drm/ttm/vmwgfx: Have TTM manage the validation sequence. drm/ttm: Improved fencing of buffer object lists drm/ttm/radeon/nouveau: Kill the bo lock in favour of a bo device fence_lock drm/ttm: Don't deadlock on recursive multi-bo reservations drm/ttm: Optimize ttm_eu_backoff_reservation drm/ttm: Use kref_sub instead of repeatedly calling kref_put kref: Add a kref_sub function drm/ttm: Add a bo list reserve fastpath (v2)
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/kref.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kref.h b/include/linux/kref.h
index 6cc38fc07ab7..d4a62ab2ee5e 100644
--- a/include/linux/kref.h
+++ b/include/linux/kref.h
@@ -24,5 +24,7 @@ struct kref {
void kref_init(struct kref *kref);
void kref_get(struct kref *kref);
int kref_put(struct kref *kref, void (*release) (struct kref *kref));
+int kref_sub(struct kref *kref, unsigned int count,
+ void (*release) (struct kref *kref));
#endif /* _KREF_H_ */