To: Andrew Morton <akpm@...>, Linux Kernel Mailing List <linux-kernel@...>
Cc: Guillaume Chazarain <guichaz@...>, Michael Neuling <mikey@...>, Balbir Singh <balbir@...>, Jay Lan <jlan@...>, Jonathan Lim <jlim@...>, Oleg Nesterov <oleg@...>
Place fields added in v6 at the end of the struct.
Signed-off-by: Guillaume Chazarain <guichaz@yahoo.fr>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Jay Lan <jlan@engr.sgi.com>
Cc: Jonathan Lim <jlim@sgi.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
---
include/linux/taskstats.h | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index 92bfd1c..dc6850c 100644
--- a/include/linux/taskstats.h
+++ b/include/linux/taskstats.h
@@ -85,12 +85,9 @@ struct taskstats {
* On some architectures, value will adjust for cpu time stolen
* from the kernel in involuntary waits due to virtualization.
* Value is cumulative, in nanoseconds, without a corresponding count
- * and wraps around to zero silently on overflow. The
- * _scaled_ version accounts for cpus which can scale the
- * number of instructions executed each cycle.
+ * and wraps around to zero silently on overflow.
*/
__u64 cpu_run_real_total;
- __u64 cpu_scaled_run_real_total;
/* cpu "virtual" running time
* Uses time intervals seen by the kernel i.e. no adjustment
@@ -146,9 +143,6 @@ struct taskstats {
__u64 read_syscalls; /* read syscalls */
__u64 write_syscalls; /* write syscalls */
- /* time accounting for SMT machines */
- __u64 ac_utimescaled; /* utime scaled on frequency etc */
- __u64 ac_stimescaled; /* stime scaled on frequency etc */
/* Extended accounting fields end */
#define TASKSTATS_HAS_IO_ACCOUNTING
@@ -159,6 +153,16 @@ struct taskstats {
__u64 nvcsw; /* voluntary_ctxt_switches */
__u64 nivcsw; /* nonvoluntary_ctxt_switches */
+
+ /*
+ * Same as cpu_run_real_total but accounts for cpus which can scale the
+ * number of instructions executed each cycle.
+ */
+ __u64 cpu_scaled_run_real_total;
+
+ /* time accounting for SMT machines */
+ __u64 ac_utimescaled; /* utime scaled on frequency etc */
+ __u64 ac_stimescaled; /* stime scaled on frequency etc */
};
-
