OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull 5165 into release branch

This commit is contained in:
Len Brown 2005-12-05 17:08:40 -05:00
parent e4f5c82a92 1e48396993
commit 927fe18397
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/acpi/processor_idle.c
View File

@ -274,8 +274,6 @@ static void acpi_processor_idle(void)
} }
} }
cx->usage++;
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
/* /*
* Check for P_LVL2_UP flag before entering C2 and above on * Check for P_LVL2_UP flag before entering C2 and above on
@ -283,9 +281,12 @@ static void acpi_processor_idle(void)
* detection phase, to work cleanly with logical CPU hotplug. * detection phase, to work cleanly with logical CPU hotplug.
*/ */
if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
!pr->flags.has_cst && acpi_fadt.plvl2_up) !pr->flags.has_cst && !acpi_fadt.plvl2_up)
cx->type = ACPI_STATE_C1; cx = &pr->power.states[ACPI_STATE_C1];
#endif #endif
cx->usage++;
/* /*
* Sleep: * Sleep:
* ------ * ------
@ -386,6 +387,15 @@ static void acpi_processor_idle(void)
next_state = pr->power.state; next_state = pr->power.state;
#ifdef CONFIG_HOTPLUG_CPU
/* Don't do promotion/demotion */
if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
!pr->flags.has_cst && !acpi_fadt.plvl2_up) {
next_state = cx;
goto end;
}
#endif
/* /*
* Promotion? * Promotion?
* ---------- * ----------
@ -557,7 +567,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
* Check for P_LVL2_UP flag before entering C2 and above on * Check for P_LVL2_UP flag before entering C2 and above on
* an SMP system. * an SMP system.
*/ */
if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up) if ((num_online_cpus() > 1) && !acpi_fadt.plvl2_up)
return_VALUE(-ENODEV); return_VALUE(-ENODEV);
#endif #endif