projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27b4b93 8b43876)
Merge branch 'sched/cputime' of git://git.kernel.org/pub/scm/linux/kernel/git/frederi...
authorIngo Molnar <mingo@kernel.org>
Fri, 8 Mar 2013 15:41:22 +0000 (16:41 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 8 Mar 2013 15:41:22 +0000 (16:41 +0100)
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>
1  2 
include/linux/sched.h patch | diff1 | diff2 | blob | history
kernel/sched/core.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched/core.c
Simple merge
Domain: System / Kernel;