Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f494f8fcb18e962839a82d542fbe6bed9cf5be07

Authored by Michael Neuling
Committed by Linus Torvalds
1 parent c66f08be7e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

add-scaled-time-to-taskstats-based-process-accounting fix 

This moves the new items to the end of the taskstats struct as
requested by Balbir and yourself.

Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Jay Lan <jlan@engr.sgi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 8 deletions Side-by-side Diff

include/linux/taskstats.h
Diff comments   View file @ f494f8f
... ... @@ -85,12 +85,9 @@
85 85 * On some architectures, value will adjust for cpu time stolen
86 86 * from the kernel in involuntary waits due to virtualization.
87 87 * Value is cumulative, in nanoseconds, without a corresponding count
88   - * and wraps around to zero silently on overflow. The
89   - * _scaled_ version accounts for cpus which can scale the
90   - * number of instructions executed each cycle.
  88 + * and wraps around to zero silently on overflow
91 89 */
92 90 __u64 cpu_run_real_total;
93   - __u64 cpu_scaled_run_real_total;
94 91  
95 92 /* cpu "virtual" running time
96 93 * Uses time intervals seen by the kernel i.e. no adjustment
... ... @@ -145,10 +142,6 @@
145 142 __u64 write_char; /* bytes written */
146 143 __u64 read_syscalls; /* read syscalls */
147 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 145 /* Extended accounting fields end */
153 146  
154 147 #define TASKSTATS_HAS_IO_ACCOUNTING
... ... @@ -159,6 +152,11 @@
159 152  
160 153 __u64 nvcsw; /* voluntary_ctxt_switches */
161 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