diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/gpu/drm/ttm/ttm_object.c | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_object.c')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index 75e9d6f86ba4..ebddd443d91a 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c | |||
@@ -206,7 +206,7 @@ void ttm_base_object_unref(struct ttm_base_object **p_base) | |||
206 | */ | 206 | */ |
207 | 207 | ||
208 | write_lock(&tdev->object_lock); | 208 | write_lock(&tdev->object_lock); |
209 | (void)kref_put(&base->refcount, &ttm_release_base); | 209 | kref_put(&base->refcount, ttm_release_base); |
210 | write_unlock(&tdev->object_lock); | 210 | write_unlock(&tdev->object_lock); |
211 | } | 211 | } |
212 | EXPORT_SYMBOL(ttm_base_object_unref); | 212 | EXPORT_SYMBOL(ttm_base_object_unref); |