From 88094b5a33c4943737b9d74142d32ad9a70b7e08 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Mon, 17 Oct 2011 13:27:34 +0200 Subject: [PATCH] --- yaml --- r: 264362 b: refs/heads/master c: e22469ca88a8f1f6fe47adbf5e5ce0906aec07cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- trunk/kernel/posix-cpu-timers.c | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1549071dbd03..e402b0805879 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcd5cff7216f9b2de0a148cc355eac199dc6f1cf +refs/heads/master: e22469ca88a8f1f6fe47adbf5e5ce0906aec07cd diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c b/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c index ae3c6f5dd2b7..082fcaea583f 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -321,7 +321,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type]; struct ttm_tt *ttm = bo->ttm; struct ttm_mem_reg *old_mem = &bo->mem; - struct ttm_mem_reg old_copy; + struct ttm_mem_reg old_copy = *old_mem; void *old_iomap; void *new_iomap; int ret; diff --git a/trunk/kernel/posix-cpu-timers.c b/trunk/kernel/posix-cpu-timers.c index 640ded8f5c48..c8008dd58ef2 100644 --- a/trunk/kernel/posix-cpu-timers.c +++ b/trunk/kernel/posix-cpu-timers.c @@ -274,7 +274,9 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times) struct task_cputime sum; unsigned long flags; + spin_lock_irqsave(&cputimer->lock, flags); if (!cputimer->running) { + cputimer->running = 1; /* * The POSIX timer interface allows for absolute time expiry * values through the TIMER_ABSTIME flag, therefore we have @@ -282,11 +284,8 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times) * it. */ thread_group_cputime(tsk, &sum); - spin_lock_irqsave(&cputimer->lock, flags); - cputimer->running = 1; update_gt_cputime(&cputimer->cputime, &sum); - } else - spin_lock_irqsave(&cputimer->lock, flags); + } *times = cputimer->cputime; spin_unlock_irqrestore(&cputimer->lock, flags); }