sched/accounting: Change cpustat fields to an array

This patch changes fields in cpustat from a structure, to an
u64 array. Math gets easier, and the code is more flexible.

Signed-off-by: Glauber Costa <glommer@parallels.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Paul Tuner <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1322498719-2255-2-git-send-email-glommer@parallels.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c
index 92f1cb745d69..4de031d6b76c 100644
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
@@ -115,21 +115,21 @@ static void appldata_get_os_data(void *data)
         j = 0;
         for_each_online_cpu(i) {
                 os_data->os_cpu[j].per_cpu_user =
-                        cputime_to_jiffies(kstat_cpu(i).cpustat.user);
+                        cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_USER]);
                 os_data->os_cpu[j].per_cpu_nice =
-                        cputime_to_jiffies(kstat_cpu(i).cpustat.nice);
+                        cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_NICE]);
                 os_data->os_cpu[j].per_cpu_system =
-                        cputime_to_jiffies(kstat_cpu(i).cpustat.system);
+                        cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]);
                 os_data->os_cpu[j].per_cpu_idle =
-                        cputime_to_jiffies(kstat_cpu(i).cpustat.idle);
+                        cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IDLE]);
                 os_data->os_cpu[j].per_cpu_irq =
-                        cputime_to_jiffies(kstat_cpu(i).cpustat.irq);
+                        cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IRQ]);
                 os_data->os_cpu[j].per_cpu_softirq =
-                        cputime_to_jiffies(kstat_cpu(i).cpustat.softirq);
+                        cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ]);
                 os_data->os_cpu[j].per_cpu_iowait =
-                        cputime_to_jiffies(kstat_cpu(i).cpustat.iowait);
+                        cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IOWAIT]);
                 os_data->os_cpu[j].per_cpu_steal =
-                        cputime_to_jiffies(kstat_cpu(i).cpustat.steal);
+                        cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_STEAL]);
                 os_data->os_cpu[j].cpu_id = i;
                 j++;
         }