Merge branch 'cputime' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
Linus Torvalds [Sat, 3 Jan 2009 19:56:24 +0000 (11:56 -0800)]
* '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

1  2 
arch/powerpc/kernel/time.c
arch/s390/kernel/smp.c
arch/x86/xen/time.c
include/linux/sched.h
kernel/sched.c
kernel/time/tick-sched.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
@@@ -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