diff options
-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 6fe121434ff..ea23c64bd76 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -955,6 +955,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
955 | */ | 955 | */ |
956 | acpi_state_timer_broadcast(pr, cx, 1); | 956 | acpi_state_timer_broadcast(pr, cx, 1); |
957 | 957 | ||
958 | kt1 = ktime_get_real(); | ||
958 | /* | 959 | /* |
959 | * disable bus master | 960 | * disable bus master |
960 | * bm_check implies we need ARB_DIS | 961 | * bm_check implies we need ARB_DIS |
@@ -976,10 +977,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
976 | ACPI_FLUSH_CPU_CACHE(); | 977 | ACPI_FLUSH_CPU_CACHE(); |
977 | } | 978 | } |
978 | 979 | ||
979 | kt1 = ktime_get_real(); | ||
980 | acpi_idle_do_entry(cx); | 980 | acpi_idle_do_entry(cx); |
981 | kt2 = ktime_get_real(); | ||
982 | idle_time = ktime_to_us(ktime_sub(kt2, kt1)); | ||
983 | 981 | ||
984 | /* Re-enable bus master arbitration */ | 982 | /* Re-enable bus master arbitration */ |
985 | if (pr->flags.bm_check && pr->flags.bm_control) { | 983 | if (pr->flags.bm_check && pr->flags.bm_control) { |
@@ -988,6 +986,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
988 | c3_cpu_count--; | 986 | c3_cpu_count--; |
989 | spin_unlock(&c3_lock); | 987 | spin_unlock(&c3_lock); |
990 | } | 988 | } |
989 | kt2 = ktime_get_real(); | ||
990 | idle_time = ktime_to_us(ktime_sub(kt2, kt1)); | ||
991 | 991 | ||
992 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) | 992 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) |
993 | /* TSC could halt in idle, so notify users */ | 993 | /* TSC could halt in idle, so notify users */ |