diff options
Diffstat (limited to 'drivers/acpi/processor_idle.c')
-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 df38e81cc672..d50a7b6ccddd 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -791,7 +791,7 @@ static int acpi_idle_enter(struct cpuidle_device *dev, | |||
791 | return index; | 791 | return index; |
792 | } | 792 | } |
793 | 793 | ||
794 | static void acpi_idle_enter_freeze(struct cpuidle_device *dev, | 794 | static void acpi_idle_enter_s2idle(struct cpuidle_device *dev, |
795 | struct cpuidle_driver *drv, int index) | 795 | struct cpuidle_driver *drv, int index) |
796 | { | 796 | { |
797 | struct acpi_processor_cx *cx = per_cpu(acpi_cstate[index], dev->cpu); | 797 | struct acpi_processor_cx *cx = per_cpu(acpi_cstate[index], dev->cpu); |
@@ -876,14 +876,14 @@ static int acpi_processor_setup_cstates(struct acpi_processor *pr) | |||
876 | drv->safe_state_index = count; | 876 | drv->safe_state_index = count; |
877 | } | 877 | } |
878 | /* | 878 | /* |
879 | * Halt-induced C1 is not good for ->enter_freeze, because it | 879 | * Halt-induced C1 is not good for ->enter_s2idle, because it |
880 | * re-enables interrupts on exit. Moreover, C1 is generally not | 880 | * re-enables interrupts on exit. Moreover, C1 is generally not |
881 | * particularly interesting from the suspend-to-idle angle, so | 881 | * particularly interesting from the suspend-to-idle angle, so |
882 | * avoid C1 and the situations in which we may need to fall back | 882 | * avoid C1 and the situations in which we may need to fall back |
883 | * to it altogether. | 883 | * to it altogether. |
884 | */ | 884 | */ |
885 | if (cx->type != ACPI_STATE_C1 && !acpi_idle_fallback_to_c1(pr)) | 885 | if (cx->type != ACPI_STATE_C1 && !acpi_idle_fallback_to_c1(pr)) |
886 | state->enter_freeze = acpi_idle_enter_freeze; | 886 | state->enter_s2idle = acpi_idle_enter_s2idle; |
887 | 887 | ||
888 | count++; | 888 | count++; |
889 | if (count == CPUIDLE_STATE_MAX) | 889 | if (count == CPUIDLE_STATE_MAX) |