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>

diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index 92bfd1c153fb9048919d5c4e180456ae9205ee5f..5d69c0744fff60283c74fbd4ca7a8c28ee4715cf 100644 (file)
--- 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
@@ -145,10 +142,6 @@ struct taskstats {
        __u64   write_char;             /* bytes written */
        __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 +152,11 @@ struct taskstats {
 
        __u64  nvcsw;                   /* voluntary_ctxt_switches */
        __u64  nivcsw;                  /* nonvoluntary_ctxt_switches */
+
+       /* time accounting for SMT machines */
+       __u64   ac_utimescaled;         /* utime scaled on frequency etc */
+       __u64   ac_stimescaled;         /* stime scaled on frequency etc */
+       __u64   cpu_scaled_run_real_total; /* scaled cpu_run_real_total */
 };