浏览代码

ACPI / cpuidle: Drop unnecessary calls from acpi_idle_do_entry()

Since the cpuidle core calls stop_critical_timings() and
start_critical_timings() around the execution of ->enter callbacks,
acpi_idle_do_entry() doesn't need to do that (and really shouldn't).

Also using "inline" on it is pointless and the kerneldoc entry does
not reflect the actual situation any more.

Fix all of the above.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Rafael J. Wysocki 10 年之前
父节点
当前提交
b00783fd90
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      drivers/acpi/processor_idle.c

+ 2 - 5
drivers/acpi/processor_idle.c

@@ -681,15 +681,13 @@ static int acpi_idle_bm_check(void)
 }
 }
 
 
 /**
 /**
- * acpi_idle_do_entry - a helper function that does C2 and C3 type entry
+ * acpi_idle_do_entry - enter idle state using the appropriate method
  * @cx: cstate data
  * @cx: cstate data
  *
  *
  * Caller disables interrupt before call and enables interrupt after return.
  * Caller disables interrupt before call and enables interrupt after return.
  */
  */
-static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
+static void acpi_idle_do_entry(struct acpi_processor_cx *cx)
 {
 {
-	/* Don't trace irqs off for idle */
-	stop_critical_timings();
 	if (cx->entry_method == ACPI_CSTATE_FFH) {
 	if (cx->entry_method == ACPI_CSTATE_FFH) {
 		/* Call into architectural FFH based C-state */
 		/* Call into architectural FFH based C-state */
 		acpi_processor_ffh_cstate_enter(cx);
 		acpi_processor_ffh_cstate_enter(cx);
@@ -703,7 +701,6 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
 		   gets asserted in time to freeze execution properly. */
 		   gets asserted in time to freeze execution properly. */
 		inl(acpi_gbl_FADT.xpm_timer_block.address);
 		inl(acpi_gbl_FADT.xpm_timer_block.address);
 	}
 	}
-	start_critical_timings();
 }
 }
 
 
 /**
 /**