Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / s390 / appldata / appldata_os.c

diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c
index b83f074..99ddd3b 100644 (file)
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
@@ -49,7 +49,7 @@ struct appldata_os_per_cpu {
        u32 per_cpu_softirq;    /* ... spent in softirqs            */
        u32 per_cpu_iowait;     /* ... spent while waiting for I/O  */
 // <-- New in 2.6
-};
+} __attribute__((packed));
 
 struct appldata_os_data {
        u64 timestamp;
@@ -75,7 +75,7 @@ struct appldata_os_data {
 
        /* per cpu data */
        struct appldata_os_per_cpu os_cpu[0];
-};
+} __attribute__((packed));
 
 static struct appldata_os_data *appldata_os_data;
 
@@ -141,19 +141,19 @@ static void appldata_get_os_data(void *data)
        j = 0;
        for_each_online_cpu(i) {
                os_data->os_cpu[j].per_cpu_user =
-                                       kstat_cpu(i).cpustat.user;
+                       cputime_to_jiffies(kstat_cpu(i).cpustat.user);
                os_data->os_cpu[j].per_cpu_nice =
-                                       kstat_cpu(i).cpustat.nice;
+                       cputime_to_jiffies(kstat_cpu(i).cpustat.nice);
                os_data->os_cpu[j].per_cpu_system =
-                                       kstat_cpu(i).cpustat.system;
+                       cputime_to_jiffies(kstat_cpu(i).cpustat.system);
                os_data->os_cpu[j].per_cpu_idle =
-                                       kstat_cpu(i).cpustat.idle;
+                       cputime_to_jiffies(kstat_cpu(i).cpustat.idle);
                os_data->os_cpu[j].per_cpu_irq =
-                                       kstat_cpu(i).cpustat.irq;
+                       cputime_to_jiffies(kstat_cpu(i).cpustat.irq);
                os_data->os_cpu[j].per_cpu_softirq =
-                                       kstat_cpu(i).cpustat.softirq;
+                       cputime_to_jiffies(kstat_cpu(i).cpustat.softirq);
                os_data->os_cpu[j].per_cpu_iowait =
-                                       kstat_cpu(i).cpustat.iowait;
+                       cputime_to_jiffies(kstat_cpu(i).cpustat.iowait);
                j++;
        }