git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
[pandora-kernel.git]
/
drivers
/
cpuidle
/
governors
/
menu.c
diff --git
a/drivers/cpuidle/governors/menu.c
b/drivers/cpuidle/governors/menu.c
index
1aea715
..
f8e57c6
100644
(file)
--- a/
drivers/cpuidle/governors/menu.c
+++ b/
drivers/cpuidle/governors/menu.c
@@
-100,7
+100,6
@@
struct menu_device {
int needs_update;
unsigned int expected_us;
int needs_update;
unsigned int expected_us;
- unsigned int measured_us;
u64 predicted_us;
unsigned int exit_us;
unsigned int bucket;
u64 predicted_us;
unsigned int exit_us;
unsigned int bucket;
@@
-187,14
+186,14
@@
static int menu_select(struct cpuidle_device *dev)
int i;
int multiplier;
int i;
int multiplier;
- data->last_state_idx = 0;
- data->exit_us = 0;
-
if (data->needs_update) {
menu_update(dev);
data->needs_update = 0;
}
if (data->needs_update) {
menu_update(dev);
data->needs_update = 0;
}
+ data->last_state_idx = 0;
+ data->exit_us = 0;
+
/* Special case when user has set very strict latency requirement */
if (unlikely(latency_req == 0))
return 0;
/* Special case when user has set very strict latency requirement */
if (unlikely(latency_req == 0))
return 0;
@@
-294,7
+293,7
@@
static void menu_update(struct cpuidle_device *dev)
new_factor = data->correction_factor[data->bucket]
* (DECAY - 1) / DECAY;
new_factor = data->correction_factor[data->bucket]
* (DECAY - 1) / DECAY;
- if (data->expected_us > 0 &&
data->
measured_us < MAX_INTERESTING)
+ if (data->expected_us > 0 && measured_us < MAX_INTERESTING)
new_factor += RESOLUTION * measured_us / data->expected_us;
else
/*
new_factor += RESOLUTION * measured_us / data->expected_us;
else
/*