From a5575fcfc6bc8edfa1c371656f6d8e04c7d7875d Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Wed, 28 Apr 2010 11:33:24 +0200 Subject: [PATCH] --- yaml --- r: 190719 b: refs/heads/master c: 5be6eff965aee22181d7f6210c2c463420e94e03 h: refs/heads/master i: 190717: 5cf0a1032d3dfe6fef1e93a128fbcfba2add2278 190715: 636d38c0a77810d42863ad4cc129034ae22ab422 190711: 301dd41fcc8d856d96e4c6e2f6cab7e5def71c0c 190703: c95fa66f2d6aac21add6dea7dbba943694c425cf 190687: 82568903e907eb1a324fb8c35dea142f2024514a 190655: 317f9719beba37fa95e028f8ccc37d5c5b291c41 190591: 815f5296c4ab5f4ce93b58f9217073fe2301ee9c 190463: 9fa46ead279b0cead98ffc3098f502d385d3d08a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_lock.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d4607f11d1c6..fe13ad1f3ad0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fa07bf146aaee1e8409d35ab08624041c2e3867 +refs/heads/master: 5be6eff965aee22181d7f6210c2c463420e94e03 diff --git a/trunk/drivers/gpu/drm/ttm/ttm_lock.c b/trunk/drivers/gpu/drm/ttm/ttm_lock.c index 3d172ef04ee1..de41e55a944a 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_lock.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_lock.c @@ -204,7 +204,6 @@ static int __ttm_vt_unlock(struct ttm_lock *lock) lock->flags &= ~TTM_VT_LOCK; wake_up_all(&lock->queue); spin_unlock(&lock->lock); - printk(KERN_INFO TTM_PFX "vt unlock.\n"); return ret; } @@ -265,10 +264,8 @@ int ttm_vt_lock(struct ttm_lock *lock, ttm_lock_type, &ttm_vt_lock_remove, NULL); if (ret) (void)__ttm_vt_unlock(lock); - else { + else lock->vt_holder = tfile; - printk(KERN_INFO TTM_PFX "vt lock.\n"); - } return ret; }