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 branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux...
[linux-2.6-block.git]
/
drivers
/
cpuidle
/
cpuidle.c
diff --git
a/drivers/cpuidle/cpuidle.c
b/drivers/cpuidle/cpuidle.c
index bb6e3b338043e13e8e87bc8fceaad67e8f6a9dcc..5bed73329ef825e2f423f04f4540d57330d30b73 100644
(file)
--- a/
drivers/cpuidle/cpuidle.c
+++ b/
drivers/cpuidle/cpuidle.c
@@
-16,6
+16,7
@@
#include <linux/cpu.h>
#include <linux/cpuidle.h>
#include <linux/ktime.h>
#include <linux/cpu.h>
#include <linux/cpuidle.h>
#include <linux/ktime.h>
+#include <linux/hrtimer.h>
#include "cpuidle.h"
#include "cpuidle.h"
@@
-64,6
+65,12
@@
static void cpuidle_idle_call(void)
return;
}
return;
}
+ /*
+ * run any timers that can be run now, at this point
+ * before calculating the idle duration etc.
+ */
+ hrtimer_peek_ahead_timers();
+
/* ask the governor for the next state */
next_state = cpuidle_curr_governor->select(dev);
if (need_resched())
/* ask the governor for the next state */
next_state = cpuidle_curr_governor->select(dev);
if (need_resched())