Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / include / linux / taskstats.h

diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index dce1ed2049727a9b7a3576abc0c075440bc121e6..5d69c0744fff60283c74fbd4ca7a8c28ee4715cf 100644 (file)
--- a/include/linux/taskstats.h
+++ b/include/linux/taskstats.h
@@ -31,7 +31,7 @@
  */
 
 
-#define TASKSTATS_VERSION      5
+#define TASKSTATS_VERSION      6
 #define TS_COMM_LEN            32      /* should be >= TASK_COMM_LEN
                                         * in linux/sched.h */
 
@@ -152,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 */
 };