diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2002-07-03 05:41:39 -0700 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2002-07-03 05:41:39 -0700 |
| commit | 39da0769da5f50067cea63d7857e7192cd58a07e (patch) | |
| tree | 1cff73d686a776df211bb0767333046cafbeae27 /arch | |
| parent | 26257368241c9cf65a7716d7f8665505fa00f845 (diff) | |
| parent | 55eebc460dcad11fcfbe10be5da3374240914582 (diff) | |
Merge http://linus.bkbits.net/linux-2.5
into maxwell.earthlink.net:/tmp/linus-2.5
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/apm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index d6814ebef9a4..d19bce8ee5f7 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -814,16 +814,16 @@ recalc: if (jiffies_since_last_check > IDLE_CALC_LIMIT) { use_apm_idle = 0; last_jiffies = jiffies; - last_stime = current->times.tms_stime; + last_stime = current->stime; } else if (jiffies_since_last_check > idle_period) { unsigned int idle_percentage; - idle_percentage = current->times.tms_stime - last_stime; + idle_percentage = current->stime - last_stime; idle_percentage *= 100; idle_percentage /= jiffies_since_last_check; use_apm_idle = (idle_percentage > idle_threshold); last_jiffies = jiffies; - last_stime = current->times.tms_stime; + last_stime = current->stime; } bucket = IDLE_LEAKY_MAX; |