summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-02 23:55:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-02 23:55:17 +0100
commit67f592c8f681061d69c621b97a868e679c8a77be (patch)
tree7f67d80f53b8bbf88cc2786ac5a3e8748dd7a7c7 /drivers/acpi
parentb00783fd90388d221dabd4df2affeea7da2363cd (diff)
downloadlinux-67f592c8f681061d69c621b97a868e679c8a77be.tar.bz2
ACPI / cpuidle: Drop unnecessary calls from ->enter callback routines
acpi_idle_enter_simple() and acpi_idle_enter_bm() don't need to call sched_clock_idle_sleep/wakeup_event(), because that's taken care of by the core already. Namely, sched_clock_idle_sleep_event() is called by tick_nohz_start_idle() called by __tick_nohz_idle_enter() which in turn is called by tick_nohz_idle_enter() and that is called by cpu_idle_loop(). Analogously for sched_clock_idle_wakeup_event(). For this reason, drop those calls from the ACPI cpuidle driver's ->enter callback routines. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_idle.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index f36517164553..ceeff3d473f1 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -791,12 +791,8 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
if (cx->type == ACPI_STATE_C3)
ACPI_FLUSH_CPU_CACHE();
- /* Tell the scheduler that we are going deep-idle: */
- sched_clock_idle_sleep_event();
acpi_idle_do_entry(cx);
- sched_clock_idle_wakeup_event(0);
-
lapic_timer_state_broadcast(pr, cx, 0);
return index;
}
@@ -842,8 +838,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
acpi_unlazy_tlb(smp_processor_id());
- /* Tell the scheduler that we are going deep-idle: */
- sched_clock_idle_sleep_event();
/*
* Must be done before busmaster disable as we might need to
* access HPET !
@@ -881,8 +875,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
raw_spin_unlock(&c3_lock);
}
- sched_clock_idle_wakeup_event(0);
-
lapic_timer_state_broadcast(pr, cx, 0);
return index;
}