diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/processor_idle.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index d2830f39d46b..9645758c0472 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -763,11 +763,9 @@ static int acpi_idle_bm_check(void) | |||
763 | */ | 763 | */ |
764 | static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx) | 764 | static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx) |
765 | { | 765 | { |
766 | u64 perf_flags; | ||
767 | |||
768 | /* Don't trace irqs off for idle */ | 766 | /* Don't trace irqs off for idle */ |
769 | stop_critical_timings(); | 767 | stop_critical_timings(); |
770 | perf_flags = hw_perf_save_disable(); | 768 | perf_disable(); |
771 | if (cx->entry_method == ACPI_CSTATE_FFH) { | 769 | if (cx->entry_method == ACPI_CSTATE_FFH) { |
772 | /* Call into architectural FFH based C-state */ | 770 | /* Call into architectural FFH based C-state */ |
773 | acpi_processor_ffh_cstate_enter(cx); | 771 | acpi_processor_ffh_cstate_enter(cx); |
@@ -782,7 +780,7 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx) | |||
782 | gets asserted in time to freeze execution properly. */ | 780 | gets asserted in time to freeze execution properly. */ |
783 | unused = inl(acpi_gbl_FADT.xpm_timer_block.address); | 781 | unused = inl(acpi_gbl_FADT.xpm_timer_block.address); |
784 | } | 782 | } |
785 | hw_perf_restore(perf_flags); | 783 | perf_enable(); |
786 | start_critical_timings(); | 784 | start_critical_timings(); |
787 | } | 785 | } |
788 | 786 | ||