aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/processor_idle.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index eefd4aa0e71d..70599d2ada61 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1023,7 +1023,6 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
1023 state->flags = 0; 1023 state->flags = 0;
1024 switch (cx->type) { 1024 switch (cx->type) {
1025 case ACPI_STATE_C1: 1025 case ACPI_STATE_C1:
1026 state->flags |= CPUIDLE_FLAG_SHALLOW;
1027 if (cx->entry_method == ACPI_CSTATE_FFH) 1026 if (cx->entry_method == ACPI_CSTATE_FFH)
1028 state->flags |= CPUIDLE_FLAG_TIME_VALID; 1027 state->flags |= CPUIDLE_FLAG_TIME_VALID;
1029 1028
@@ -1032,16 +1031,13 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
1032 break; 1031 break;
1033 1032
1034 case ACPI_STATE_C2: 1033 case ACPI_STATE_C2:
1035 state->flags |= CPUIDLE_FLAG_BALANCED;
1036 state->flags |= CPUIDLE_FLAG_TIME_VALID; 1034 state->flags |= CPUIDLE_FLAG_TIME_VALID;
1037 state->enter = acpi_idle_enter_simple; 1035 state->enter = acpi_idle_enter_simple;
1038 dev->safe_state = state; 1036 dev->safe_state = state;
1039 break; 1037 break;
1040 1038
1041 case ACPI_STATE_C3: 1039 case ACPI_STATE_C3:
1042 state->flags |= CPUIDLE_FLAG_DEEP;
1043 state->flags |= CPUIDLE_FLAG_TIME_VALID; 1040 state->flags |= CPUIDLE_FLAG_TIME_VALID;
1044 state->flags |= CPUIDLE_FLAG_CHECK_BM;
1045 state->enter = pr->flags.bm_check ? 1041 state->enter = pr->flags.bm_check ?
1046 acpi_idle_enter_bm : 1042 acpi_idle_enter_bm :
1047 acpi_idle_enter_simple; 1043 acpi_idle_enter_simple;