diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-24 10:41:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-24 10:41:31 -0400 |
| commit | 3869e929bb38499b37f8cd76ec96ab6e5a169efb (patch) | |
| tree | 7c76cc0159d4fa87367463eb97970474eab84da4 /drivers | |
| parent | 2d40570786c7c208539c65893818119557327ba0 (diff) | |
| parent | f461ddea0af8b98e2b7940eba9c693b0ee44d64a (diff) | |
| download | linux-3869e929bb38499b37f8cd76ec96ab6e5a169efb.tar.gz linux-3869e929bb38499b37f8cd76ec96ab6e5a169efb.tar.bz2 linux-3869e929bb38499b37f8cd76ec96ab6e5a169efb.zip | |
Merge branch 'hpet' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index eed3b458ebac..07c7d216c89d 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -953,6 +953,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, */ acpi_state_timer_broadcast(pr, cx, 1); + kt1 = ktime_get_real(); /* * disable bus master * bm_check implies we need ARB_DIS @@ -974,10 +975,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, ACPI_FLUSH_CPU_CACHE(); } - kt1 = ktime_get_real(); acpi_idle_do_entry(cx); - kt2 = ktime_get_real(); - idle_time = ktime_to_us(ktime_sub(kt2, kt1)); /* Re-enable bus master arbitration */ if (pr->flags.bm_check && pr->flags.bm_control) { @@ -986,6 +984,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, c3_cpu_count--; spin_unlock(&c3_lock); } + kt2 = ktime_get_real(); + idle_time = ktime_to_us(ktime_sub(kt2, kt1)); sleep_ticks = us_to_pm_timer_ticks(idle_time); /* Tell the scheduler how much we idled: */ |