summaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-03-08 16:41:22 +0100
committerIngo Molnar <mingo@kernel.org>2013-03-08 16:41:22 +0100
commit4e3da46797f8e4d8217d2e3d6857444391b306da (patch)
tree4532f3bec8e45fbc69cc8389c4c7316d3eba7ae4 /include/linux/sched.h
parent27b4b9319a3c2e8654d45df99ce584c7c2cfe100 (diff)
parent8b43876643a737bb74a0e1e557f634eb2453948b (diff)
downloadop-kernel-dev-4e3da46797f8e4d8217d2e3d6857444391b306da.zip
op-kernel-dev-4e3da46797f8e4d8217d2e3d6857444391b306da.tar.gz
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>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index fc039ce..9004f6e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -558,7 +558,7 @@ struct signal_struct {
cputime_t utime, stime, cutime, cstime;
cputime_t gtime;
cputime_t cgtime;
-#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
struct cputime prev_cputime;
#endif
unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
@@ -1158,7 +1158,7 @@ struct task_struct {
cputime_t utime, stime, utimescaled, stimescaled;
cputime_t gtime;
-#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
struct cputime prev_cputime;
#endif
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
OpenPOWER on IntegriCloud