diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-03 18:12:57 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-03 18:12:57 -0400 |
| commit | aefdcfa6c243702f1d35d23515d0e5eeca225c97 (patch) | |
| tree | 969a4b4a5845e854d96f2a6eaecdc99ca9f718de /drivers/acpi/processor_idle.c | |
| parent | 0c9938cc75057c0fca1af55a55dcfc2842436695 (diff) | |
| parent | 79cda7d0e1c8629996242c036d6fe0466038d8ba (diff) | |
| download | blackbird-op-linux-aefdcfa6c243702f1d35d23515d0e5eeca225c97.tar.gz blackbird-op-linux-aefdcfa6c243702f1d35d23515d0e5eeca225c97.zip | |
Merge ../to-linus
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index fd5458947851..8f7836678b29 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -86,12 +86,11 @@ static int set_max_cstate(struct dmi_system_id *id) if (max_cstate > ACPI_PROCESSOR_MAX_POWER) return 0; - printk(KERN_NOTICE PREFIX "%s detected - %s disabled." + printk(KERN_NOTICE PREFIX "%s detected - limiting to C%ld max_cstate." " Override with \"processor.max_cstate=%d\"\n", id->ident, - ((int)id->driver_data == 1)? "C2,C3":"C3", - ACPI_PROCESSOR_MAX_POWER + 1); + (long)id->driver_data, ACPI_PROCESSOR_MAX_POWER + 1); - max_cstate = (int)id->driver_data; + max_cstate = (long)id->driver_data; return 0; } |
