diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 05:26:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 05:26:38 -0500 |
| commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
| tree | a091be1024bd76627f78e791e377126e47703b7b /drivers/acpi/processor_idle.c | |
| parent | ed8f8ce38d0f7b505d7da2d79522972e962457c2 (diff) | |
| parent | 4e1c0664de11e4b5861957ab4ddff2aeeffd042f (diff) | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 499536504698..87b704e41877 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -985,8 +985,6 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) | |||
| 985 | state->flags = 0; | 985 | state->flags = 0; |
| 986 | switch (cx->type) { | 986 | switch (cx->type) { |
| 987 | case ACPI_STATE_C1: | 987 | case ACPI_STATE_C1: |
| 988 | if (cx->entry_method != ACPI_CSTATE_FFH) | ||
| 989 | state->flags |= CPUIDLE_FLAG_TIME_INVALID; | ||
| 990 | 988 | ||
| 991 | state->enter = acpi_idle_enter_c1; | 989 | state->enter = acpi_idle_enter_c1; |
| 992 | state->enter_dead = acpi_idle_play_dead; | 990 | state->enter_dead = acpi_idle_play_dead; |