Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Make acpi-cpufreq unsticky again.
  [CPUFREQ] longhaul: remove duplicated code.
  [CPUFREQ] Longhaul - Disable arbiter CLE266
  [CPUFREQ] Fix section mismatch warning
  [CPUFREQ] Fix cut-n-paste bug in suspend printk

3 files changed, 41 insertions, 24 deletions

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index ea19d091fd41..57c880bf0bd6 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -396,13 +396,13 @@ static int acpi_cpufreq_early_init_acpi(void)
  */
 static int bios_with_sw_any_bug;
 
-static int __init sw_any_bug_found(struct dmi_system_id *d)
+static int sw_any_bug_found(struct dmi_system_id *d)
 {
         bios_with_sw_any_bug = 1;
         return 0;
 }
 
-static struct dmi_system_id __initdata sw_any_bug_dmi_table[] = {
+static struct dmi_system_id sw_any_bug_dmi_table[] = {
         {
                 .callback = sw_any_bug_found,
                 .ident = "Supermicro Server X6DLP",
@@ -597,7 +597,6 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
         .name   = "acpi-cpufreq",
         .owner  = THIS_MODULE,
         .attr   = acpi_cpufreq_attr,
-        .flags  = CPUFREQ_STICKY,
 };
 
 
@@ -608,7 +607,7 @@ acpi_cpufreq_init (void)
 
         acpi_cpufreq_early_init_acpi();
 
-        return cpufreq_register_driver(&acpi_cpufreq_driver);
+        return cpufreq_register_driver(&acpi_cpufreq_driver);
 }
 
 
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index f5cc9f5c9bab..7233abe5d695 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -178,11 +178,17 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
         safe_halt();
         /* Change frequency on next halt or sleep */
         wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        ACPI_FLUSH_CPU_CACHE();
-        /* Invoke C3 */
-        inb(cx_address);
-        /* Dummy op - must do something useless after P_LVL3 read */
-        t = inl(acpi_fadt.xpm_tmr_blk.address);
+        if (port22_en) {
+                ACPI_FLUSH_CPU_CACHE();
+                /* Invoke C1 */
+                halt();
+        } else {
+                ACPI_FLUSH_CPU_CACHE();
+                /* Invoke C3 */
+                inb(cx_address);
+                /* Dummy op - must do something useless after P_LVL3 read */
+                t = inl(acpi_fadt.xpm_tmr_blk.address);
+        }
 
         /* Disable bus ratio bit */
         local_irq_disable();
@@ -567,16 +573,23 @@ static acpi_status longhaul_walk_callback(acpi_handle obj_handle,
 static int enable_arbiter_disable(void)
 {
         struct pci_dev *dev;
+        int reg;
         u8 pci_cmd;
 
         /* Find PLE133 host bridge */
+        reg = 0x78;
         dev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8601_0, NULL);
+        /* Find CLE266 host bridge */
+        if (dev == NULL) {
+                reg = 0x76;
+                dev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_862X_0, NULL);
+        }
         if (dev != NULL) {
                 /* Enable access to port 0x22 */
-                pci_read_config_byte(dev, 0x78, &pci_cmd);
+                pci_read_config_byte(dev, reg, &pci_cmd);
                 if ( !(pci_cmd & 1<<7) ) {
                         pci_cmd |= 1<<7;
-                        pci_write_config_byte(dev, 0x78, pci_cmd);
+                        pci_write_config_byte(dev, reg, pci_cmd);
                 }
                 return 1;
         }
@@ -680,20 +693,25 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
         if (longhaul_version == TYPE_POWERSAVER) {
                 /* Check ACPI support for C3 state */
                 cx = &pr->power.states[ACPI_STATE_C3];
-                if (cx->address == 0 ||
-                   (cx->latency > 1000 && ignore_latency == 0) )
+                if (cx->address > 0 &&
+                   (cx->latency <= 1000 || ignore_latency != 0) ) {
+                        goto print_support_type;
+                }
+        }
+        /* Check ACPI support for bus master arbiter disable */
+        if (!pr->flags.bm_control) {
+                if (enable_arbiter_disable()) {
+                        port22_en = 1;
+                } else {
                         goto err_acpi;
-
-        } else {
-                /* Check ACPI support for bus master arbiter disable */
-                if (!pr->flags.bm_control) {
-                        if (!enable_arbiter_disable()) {
-                                printk(KERN_ERR PFX "No ACPI support. No VT8601 host bridge. Aborting.\n");
-                                return -ENODEV;
-                        } else
-                                port22_en = 1;
                 }
         }
+print_support_type:
+        if (!port22_en) {
+                printk (KERN_INFO PFX "Using ACPI support.\n");
+        } else {
+                printk (KERN_INFO PFX "Using northbridge support.\n");
+        }
 
         ret = longhaul_get_ranges();
         if (ret != 0)
@@ -716,7 +734,7 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
         return 0;
 
 err_acpi:
-        printk(KERN_ERR PFX "No ACPI support for CPU frequency changes.\n");
+        printk(KERN_ERR PFX "No ACPI support. No VT8601 or VT8623 northbridge. Aborting.\n");
         return -ENODEV;
 }
 
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 7a9325349e94..e8993baf3d14 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -386,7 +386,7 @@ static int centrino_cpu_early_init_acpi(void)
  * than OS intended it to run at. Detect it and handle it cleanly.
  */
 static int bios_with_sw_any_bug;
-static int __init sw_any_bug_found(struct dmi_system_id *d)
+static int sw_any_bug_found(struct dmi_system_id *d)
 {
         bios_with_sw_any_bug = 1;
         return 0;