From 451152726751f280f5a8ba3d29b39aaf8ff63675 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Wed, 12 Jan 2011 02:22:56 -0500 Subject: [PATCH] --- yaml --- r: 230871 b: refs/heads/master c: 0aae9f923bcc476a8e4725dd3ac37547b9816ee5 h: refs/heads/master i: 230869: bc43ac8ee4c04340a5fb1b8ad38b0fb26ab8f0e0 230867: af1c7399c87349e9ab6c559005700b35298b06ef 230863: 390f68609e7e5e931b714602211ab5939ae34b4a v: v3 --- [refs] | 2 +- trunk/drivers/acpi/processor_idle.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 336fa93babdb..4b39ad95abd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 720f1c3010db6a411358b962a2007969117840bc +refs/heads/master: 0aae9f923bcc476a8e4725dd3ac37547b9816ee5 diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c index eefd4aa0e71d..70599d2ada61 100644 --- a/trunk/drivers/acpi/processor_idle.c +++ b/trunk/drivers/acpi/processor_idle.c @@ -1023,7 +1023,6 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) state->flags = 0; switch (cx->type) { case ACPI_STATE_C1: - state->flags |= CPUIDLE_FLAG_SHALLOW; if (cx->entry_method == ACPI_CSTATE_FFH) state->flags |= CPUIDLE_FLAG_TIME_VALID; @@ -1032,16 +1031,13 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) break; case ACPI_STATE_C2: - state->flags |= CPUIDLE_FLAG_BALANCED; state->flags |= CPUIDLE_FLAG_TIME_VALID; state->enter = acpi_idle_enter_simple; dev->safe_state = state; break; case ACPI_STATE_C3: - state->flags |= CPUIDLE_FLAG_DEEP; state->flags |= CPUIDLE_FLAG_TIME_VALID; - state->flags |= CPUIDLE_FLAG_CHECK_BM; state->enter = pr->flags.bm_check ? acpi_idle_enter_bm : acpi_idle_enter_simple;