Merge tag 'sched-cputime-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:44:43 +0000 (15:44 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:44:43 +0000 (15:44 +0100)
Pull more cputime cleanups from Frederic Weisbecker:

 * Get rid of underscores polluting the vtime namespace

 * Consolidate context switch and tick handling

 * Improve debuggability by detecting irq unsafe callers

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
include/linux/kvm_host.h
kernel/sched/cputime.c

Simple merge
Simple merge