From b16061cdcdda6795f3635f76664335418304a17f Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Thu, 18 Oct 2007 03:06:35 -0700 Subject: [PATCH] --- yaml --- r: 71203 b: refs/heads/master c: f494f8fcb18e962839a82d542fbe6bed9cf5be07 h: refs/heads/master i: 71201: db2df349e3634a00f840f9c0be47a16862dcf194 71199: 6ffe387362963f3925ec8f9b9a11bd30dcde51ff v: v3 --- [refs] | 2 +- trunk/include/linux/taskstats.h | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4f6cddbd6132..e2fb079db7ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c66f08be7e3ad0a28bcd9a0aef766fdf08ea0ec6 +refs/heads/master: f494f8fcb18e962839a82d542fbe6bed9cf5be07 diff --git a/trunk/include/linux/taskstats.h b/trunk/include/linux/taskstats.h index 92bfd1c153fb..5d69c0744fff 100644 --- a/trunk/include/linux/taskstats.h +++ b/trunk/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 */ };