Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f494f8fcb18e962839a82d542fbe6bed9cf5be07
Commit:     f494f8fcb18e962839a82d542fbe6bed9cf5be07
Parent:     c66f08be7e3ad0a28bcd9a0aef766fdf08ea0ec6
Author:     Michael Neuling <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 18 03:06:35 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Oct 18 14:37:28 2007 -0700

    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 <[EMAIL PROTECTED]>
    Cc: Jay Lan <[EMAIL PROTECTED]>
    Cc: Paul Mackerras <[EMAIL PROTECTED]>
    Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/linux/taskstats.h |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index 92bfd1c..5d69c07 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
@@ -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 */
 };
 
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to