This commit was manufactured by cvs2svn to create tag

[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..58ad2cf 100644 (file)
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
@@ -98,7 +98,8 @@ static inline void appldata_print_debug(struct appldata_os_data *os_data)
                LOAD_INT(a2), LOAD_FRAC(a2));
 
        P_DEBUG("nr_cpus = %u\n", os_data->nr_cpus);
-       for (i = 0; i < os_data->nr_cpus; i++) {
+       for (i = 0; i < NR_CPUS; i++) {
+               if (!cpu_online(i)) continue;
                P_DEBUG("cpu%u : user = %u, nice = %u, system = %u, "
                        "idle = %u, irq = %u, softirq = %u, iowait = %u\n",
                                i,
@@ -123,7 +124,7 @@ static inline void appldata_print_debug(struct appldata_os_data *os_data)
  */
 static void appldata_get_os_data(void *data)
 {
-       int i, j;
+       int i;
        struct appldata_os_data *os_data;
 
        os_data = data;
@@ -138,23 +139,21 @@ static void appldata_get_os_data(void *data)
        os_data->avenrun[1] = avenrun[1] + (FIXED_1/200);
        os_data->avenrun[2] = avenrun[2] + (FIXED_1/200);
 
-       j = 0;
-       for_each_online_cpu(i) {
-               os_data->os_cpu[j].per_cpu_user =
+       for (i = 0; i < num_online_cpus(); i++) {
+               os_data->os_cpu[i].per_cpu_user =
                                        kstat_cpu(i).cpustat.user;
-               os_data->os_cpu[j].per_cpu_nice =
+               os_data->os_cpu[i].per_cpu_nice =
                                        kstat_cpu(i).cpustat.nice;
-               os_data->os_cpu[j].per_cpu_system =
+               os_data->os_cpu[i].per_cpu_system =
                                        kstat_cpu(i).cpustat.system;
-               os_data->os_cpu[j].per_cpu_idle =
+               os_data->os_cpu[i].per_cpu_idle =
                                        kstat_cpu(i).cpustat.idle;
-               os_data->os_cpu[j].per_cpu_irq =
+               os_data->os_cpu[i].per_cpu_irq =
                                        kstat_cpu(i).cpustat.irq;
-               os_data->os_cpu[j].per_cpu_softirq =
+               os_data->os_cpu[i].per_cpu_softirq =
                                        kstat_cpu(i).cpustat.softirq;
-               os_data->os_cpu[j].per_cpu_iowait =
+               os_data->os_cpu[i].per_cpu_iowait =
                                        kstat_cpu(i).cpustat.iowait;
-               j++;
        }
 
        os_data->timestamp = get_clock();