@@ -402,10 +402,11 @@ void cpu_idle_job(void)
}
}
-void cpu_idle_delay(unsigned long delay, unsigned long min_pm)
+void cpu_idle_delay(unsigned long delay)
{
unsigned long now = mftb();
unsigned long end = now + delay;
+ unsigned long min_pm = usecs_to_tb(10);
if (pm_enabled && delay > min_pm) {
for (;;) {
@@ -66,14 +66,12 @@ void time_wait(unsigned long duration)
void time_wait_nopoll(unsigned long duration)
{
- unsigned long min_sleep = usecs_to_tb(10);
-
if (this_cpu()->tb_invalid) {
cpu_relax();
return;
}
- cpu_idle_delay(duration, min_sleep);
+ cpu_idle_delay(duration);
}
void time_wait_ms(unsigned long ms)
@@ -268,7 +268,7 @@ extern unsigned long __attrconst cpu_stack_bottom(unsigned int pir);
extern unsigned long __attrconst cpu_stack_top(unsigned int pir);
extern void cpu_idle_job(void);
-extern void cpu_idle_delay(unsigned long delay, unsigned long min_pm);
+extern void cpu_idle_delay(unsigned long delay);
extern void cpu_set_radix_mode(void);
extern void cpu_fast_reboot_complete(void);
The caller isn't in a position to know about PM heuristics, so move the minimum timeout before power managmeent into the cpu idle call. There is no functional change. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- core/cpu.c | 3 ++- core/timebase.c | 4 +--- include/cpu.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)