aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/taskstats.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index 92bfd1c153fb..5d69c0744fff 100644
--- a/include/linux/taskstats.h
+++ b/include/linux/taskstats.h
@@ -85,12 +85,9 @@ struct taskstats {
85 * On some architectures, value will adjust for cpu time stolen 85 * On some architectures, value will adjust for cpu time stolen
86 * from the kernel in involuntary waits due to virtualization. 86 * from the kernel in involuntary waits due to virtualization.
87 * Value is cumulative, in nanoseconds, without a corresponding count 87 * Value is cumulative, in nanoseconds, without a corresponding count
88 * and wraps around to zero silently on overflow. The 88 * and wraps around to zero silently on overflow
89 * _scaled_ version accounts for cpus which can scale the
90 * number of instructions executed each cycle.
91 */ 89 */
92 __u64 cpu_run_real_total; 90 __u64 cpu_run_real_total;
93 __u64 cpu_scaled_run_real_total;
94 91
95 /* cpu "virtual" running time 92 /* cpu "virtual" running time
96 * Uses time intervals seen by the kernel i.e. no adjustment 93 * Uses time intervals seen by the kernel i.e. no adjustment
@@ -145,10 +142,6 @@ struct taskstats {
145 __u64 write_char; /* bytes written */ 142 __u64 write_char; /* bytes written */
146 __u64 read_syscalls; /* read syscalls */ 143 __u64 read_syscalls; /* read syscalls */
147 __u64 write_syscalls; /* write syscalls */ 144 __u64 write_syscalls; /* write syscalls */
148
149 /* time accounting for SMT machines */
150 __u64 ac_utimescaled; /* utime scaled on frequency etc */
151 __u64 ac_stimescaled; /* stime scaled on frequency etc */
152 /* Extended accounting fields end */ 145 /* Extended accounting fields end */
153 146
154#define TASKSTATS_HAS_IO_ACCOUNTING 147#define TASKSTATS_HAS_IO_ACCOUNTING
@@ -159,6 +152,11 @@ struct taskstats {
159 152
160 __u64 nvcsw; /* voluntary_ctxt_switches */ 153 __u64 nvcsw; /* voluntary_ctxt_switches */
161 __u64 nivcsw; /* nonvoluntary_ctxt_switches */ 154 __u64 nivcsw; /* nonvoluntary_ctxt_switches */
155
156 /* time accounting for SMT machines */
157 __u64 ac_utimescaled; /* utime scaled on frequency etc */
158 __u64 ac_stimescaled; /* stime scaled on frequency etc */
159 __u64 cpu_scaled_run_real_total; /* scaled cpu_run_real_total */
162}; 160};
163 161
164 162