| commit | 4e3da46797f8e4d8217d2e3d6857444391b306da | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Mar 08 16:41:22 2013 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Mar 08 16:41:22 2013 +0100 |
| tree | 4532f3bec8e45fbc69cc8389c4c7316d3eba7ae4 | |
| parent | 27b4b9319a3c2e8654d45df99ce584c7c2cfe100 [diff] | |
| parent | 8b43876643a737bb74a0e1e557f634eb2453948b [diff] |
Merge branch 'sched/cputime' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/core
Pull cputime changes from Frederic Weisbecker:
* Generalize exception handling
* Fix race in context tracking state restore on return from exception
and irq exit kernel preemption
* Fix cputime scaling in full dynticks accounting dynamic off-case
* Fix default Kconfig value
Signed-off-by: Ingo Molnar <mingo@kernel.org>