From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Jan 2009 19:56:24 +0000 (-0800)
Subject: Merge branch 'cputime' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v3.12-rc1~16825
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61420f59a589c0668f70cbe725785837c78ece90;p=kernel%2Fkernel-generic.git

Merge branch 'cputime' of git://git390.osdl.marist.edu/linux-2.6

* 'cputime' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [PATCH] fast vdso implementation for CLOCK_THREAD_CPUTIME_ID
  [PATCH] improve idle cputime accounting
  [PATCH] improve precision of idle time detection.
  [PATCH] improve precision of process accounting.
  [PATCH] idle cputime accounting
  [PATCH] fix scaled & unscaled cputime accounting
---

61420f59a589c0668f70cbe725785837c78ece90
diff --cc kernel/time/tick-sched.c
index 76a574b,611fa4c..1b6c05b
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@@ -439,8 -441,9 +441,9 @@@ void tick_nohz_restart_sched_tick(void
  	select_nohz_load_balancer(0);
  	now = ktime_get();
  	tick_do_update_jiffies64(now);
 -	cpu_clear(cpu, nohz_cpu_mask);
 +	cpumask_clear_cpu(cpu, nohz_cpu_mask);
  
+ #ifndef CONFIG_VIRT_CPU_ACCOUNTING
  	/*
  	 * We stopped the tick in idle. Update process times would miss the
  	 * time we slept as update_process_times does only a 1 tick