diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-24 16:42:03 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-24 16:42:03 +0200 |
| commit | 9c18f0b7095c7981c48f41aae8abdaa06a76d9b3 (patch) | |
| tree | 6b7dc4c79f232133636e444514e52fabd380ed2e /drivers | |
| parent | Merge branch 'hpet' into release (diff) | |
| parent | ACPI: prevent processor.max_cstate=0 boot crash (diff) | |
| download | linux-9c18f0b7095c7981c48f41aae8abdaa06a76d9b3.tar.xz linux-9c18f0b7095c7981c48f41aae8abdaa06a76d9b3.zip | |
Merge branch 'bugzilla-13142' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 07c7d216c89d..f7ca8c55956b 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -1030,6 +1030,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) dev->states[i].desc[0] = '\0'; } + if (max_cstate == 0) + max_cstate = 1; + for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) { cx = &pr->power.states[i]; state = &dev->states[count]; |