[PATCH] Adapt scripts/ver_linux to new util-linux version strings

[linux-2.6] / drivers / acpi / processor_idle.c

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 3702725db97aa69cbd6a813038528ae2ff559572..2c04740c6543f54ea6d0c35a51d00d11e479b76b 100644 (file)
--- 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;
 }
@@ -179,7 +178,7 @@ static void acpi_processor_idle (void)
        int                     sleep_ticks = 0;
        u32                     t1, t2 = 0;
 
-       pr = processors[_smp_processor_id()];
+       pr = processors[raw_smp_processor_id()];
        if (!pr)
                return;
 
@@ -768,7 +767,6 @@ static void acpi_processor_power_verify_c3(
        }
 
        if (pr->flags.bm_check) {
-               printk("Disabling BM access before entering C3\n");
                /* bus mastering control is necessary */
                if (!pr->flags.bm_control) {
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -776,7 +774,6 @@ static void acpi_processor_power_verify_c3(
                        return_VOID;
                }
        } else {
-               printk("Invalidating cache before entering C3\n");
                /*
                 * WBINVD should be set in fadt, for C3 state to be
                 * supported on when bm_check is not required.