Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761438AbXIZRKu (ORCPT ); Wed, 26 Sep 2007 13:10:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761535AbXIZRI5 (ORCPT ); Wed, 26 Sep 2007 13:08:57 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:38597 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760377AbXIZRI4 (ORCPT ); Wed, 26 Sep 2007 13:08:56 -0400 X-IronPort-AV: E=Sophos;i="4.21,198,1188770400"; d="scan'208";a="3292263" From: Guillaume Chazarain Subject: [PATCH 8/8] taskstats: avoid breaking binary compatibility between taskstats v6 and before To: Andrew Morton , Linux Kernel Mailing List Cc: Guillaume Chazarain , Michael Neuling , Balbir Singh , Jay Lan , Jonathan Lim , Oleg Nesterov Date: Wed, 26 Sep 2007 19:08:54 +0200 Message-ID: <20070926170854.31221.57986.stgit@cheypa.inria.fr> In-Reply-To: <20070926170818.31221.33994.stgit@cheypa.inria.fr> References: <20070926170818.31221.33994.stgit@cheypa.inria.fr> User-Agent: StGIT/0.13 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2282 Lines: 64 Place fields added in v6 at the end of the struct. Signed-off-by: Guillaume Chazarain Cc: Michael Neuling Cc: Balbir Singh Cc: Jay Lan Cc: Jonathan Lim Cc: Oleg Nesterov --- 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 */ }; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/