--- ../procps-3.2.7-orig/proc/sysinfo.c 2006-06-25 15:41:48 +0900 +++ proc/sysinfo.c 2007-12-23 23:02:51 +0900 @@ -122,7 +122,8 @@ unsigned long long Hertz; static void old_Hertz_hack(void){ - unsigned long long user_j, nice_j, sys_j, other_j; /* jiffies (clock ticks) */ + unsigned long long user_j, nice_j, sys_j, idle_j, iowait_j, irq_j, + softirq_j, steal_j; /* jiffies (clock ticks) */ double up_1, up_2, seconds; unsigned long long jiffies; unsigned h; @@ -133,13 +134,15 @@ do{ FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1); /* uptime(&up_1, NULL); */ + user_j = nice_j = sys_j = idle_j = iowait_j = irq_j = softirq_j = steal_j = 0; FILE_TO_BUF(STAT_FILE,stat_fd); - sscanf(buf, "cpu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j); + sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &user_j, &nice_j, + &sys_j, &idle_j, &iowait_j, &irq_j, &softirq_j, &steal_j); FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2); /* uptime(&up_2, NULL); */ } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */ setlocale(LC_NUMERIC, savelocale); - jiffies = user_j + nice_j + sys_j + other_j; + jiffies = user_j + nice_j + sys_j + idle_j + iowait_j + irq_j + softirq_j + steal_j; seconds = (up_1 + up_2) / 2; h = (unsigned)( (double)jiffies/seconds/smp_num_cpus ); /* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */