projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release
[linux-2.6-block.git]
/
drivers
/
cpuidle
/
cpuidle.c
diff --git
a/drivers/cpuidle/cpuidle.c
b/drivers/cpuidle/cpuidle.c
index 2c4b2d47973e195cbb0422a9b539400a2ad5ef5e..d868d737742f5d005786926581d2d9cde82fc94c 100644
(file)
--- a/
drivers/cpuidle/cpuidle.c
+++ b/
drivers/cpuidle/cpuidle.c
@@
-83,7
+83,7
@@
void cpuidle_uninstall_idle_handler(void)
{
if (enabled_devices && (pm_idle != pm_idle_old)) {
pm_idle = pm_idle_old;
- cpu
_idle_wait
();
+ cpu
idle_kick_cpus
();
}
}