From 4412d4d5a44dcc6d9a09837efa52ed9d68a16488 Mon Sep 17 00:00:00 2001 From: "venkatesh.pallipadi@intel.com" Date: Wed, 30 Jul 2008 19:21:44 -0700 Subject: [PATCH] --- yaml --- r: 108574 b: refs/heads/master c: 06d9e908b2248f983b186aaf569c58e1430db85d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/cpuidle/governors/ladder.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5297cecaf957..fca5ba6b2526 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 320eee776357db52d6fcfb11cff985b1976a4595 +refs/heads/master: 06d9e908b2248f983b186aaf569c58e1430db85d diff --git a/trunk/drivers/cpuidle/governors/ladder.c b/trunk/drivers/cpuidle/governors/ladder.c index 27ab3bfe375b..a4bec3f919aa 100644 --- a/trunk/drivers/cpuidle/governors/ladder.c +++ b/trunk/drivers/cpuidle/governors/ladder.c @@ -98,6 +98,18 @@ static int ladder_select_state(struct cpuidle_device *dev) } /* consider demotion */ + if (last_idx > CPUIDLE_DRIVER_STATE_START && + dev->states[last_idx].exit_latency > latency_req) { + int i; + + for (i = last_idx - 1; i > CPUIDLE_DRIVER_STATE_START; i--) { + if (dev->states[i].exit_latency <= latency_req) + break; + } + ladder_do_selection(ldev, last_idx, i); + return i; + } + if (last_idx > CPUIDLE_DRIVER_STATE_START && last_residency < last_state->threshold.demotion_time) { last_state->stats.demotion_count++;