Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix cast warning in pcc driver.
  [CPUFREQ] Processor Clocking Control interface driver

diff --combined drivers/acpi/processor_core.c
index 9863c98,7fe413c..e9b7b40
--- 1/drivers/acpi/processor_core.c
--- 2/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@@ -123,7 -123,32 +123,9 @@@ static const struct file_operations acp
  #endif
  
  DEFINE_PER_CPU(struct acpi_processor *, processors);
+ EXPORT_PER_CPU_SYMBOL(processors);
+ 
  struct acpi_processor_errata errata __read_mostly;
 -static int set_no_mwait(const struct dmi_system_id *id)
 -{
 -      printk(KERN_NOTICE PREFIX "%s detected - "
 -              "disabling mwait for CPU C-states\n", id->ident);
 -      idle_nomwait = 1;
 -      return 0;
 -}
 -
 -static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
 -      {
 -      set_no_mwait, "IFL91 board", {
 -      DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
 -      DMI_MATCH(DMI_SYS_VENDOR, "ZEPTO"),
 -      DMI_MATCH(DMI_PRODUCT_VERSION, "3215W"),
 -      DMI_MATCH(DMI_BOARD_NAME, "IFL91") }, NULL},
 -      {
 -      set_no_mwait, "Extensa 5220", {
 -      DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
 -      DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
 -      DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
 -      DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},
 -      {},
 -};
  
  /* --------------------------------------------------------------------------
                                  Errata Handling
@@@ -253,6 -278,45 +255,6 @@@ static int acpi_processor_errata(struc
        return result;
  }
  
 -/* --------------------------------------------------------------------------
 -                              Common ACPI processor functions
 -   -------------------------------------------------------------------------- */
 -
 -/*
 - * _PDC is required for a BIOS-OS handshake for most of the newer
 - * ACPI processor features.
 - */
 -static int acpi_processor_set_pdc(struct acpi_processor *pr)
 -{
 -      struct acpi_object_list *pdc_in = pr->pdc;
 -      acpi_status status = AE_OK;
 -
 -
 -      if (!pdc_in)
 -              return status;
 -      if (idle_nomwait) {
 -              /*
 -               * If mwait is disabled for CPU C-states, the C2C3_FFH access
 -               * mode will be disabled in the parameter of _PDC object.
 -               * Of course C1_FFH access mode will also be disabled.
 -               */
 -              union acpi_object *obj;
 -              u32 *buffer = NULL;
 -
 -              obj = pdc_in->pointer;
 -              buffer = (u32 *)(obj->buffer.pointer);
 -              buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH);
 -
 -      }
 -      status = acpi_evaluate_object(pr->handle, "_PDC", pdc_in, NULL);
 -
 -      if (ACPI_FAILURE(status))
 -              ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 -                  "Could not evaluate _PDC, using legacy perf. control...\n"));
 -
 -      return status;
 -}
 -
  /* --------------------------------------------------------------------------
                                FS Interface (/proc)
     -------------------------------------------------------------------------- */
@@@ -763,7 -827,9 +765,7 @@@ static int __cpuinit acpi_processor_add
        }
  
        /* _PDC call should be done before doing anything else (if reqd.). */
 -      arch_acpi_processor_init_pdc(pr);
 -      acpi_processor_set_pdc(pr);
 -      arch_acpi_processor_cleanup_pdc(pr);
 +      acpi_processor_set_pdc(pr->handle);
  
  #ifdef CONFIG_CPU_FREQ
        acpi_processor_ppc_has_changed(pr, 0);
@@@ -1081,6 -1147,11 +1083,6 @@@ static int __init acpi_processor_init(v
        if (!acpi_processor_dir)
                return -ENOMEM;
  #endif
 -      /*
 -       * Check whether the system is DMI table. If yes, OSPM
 -       * should not use mwait for CPU-states.
 -       */
 -      dmi_check_system(processor_idle_dmi_table);
        result = cpuidle_register_driver(&acpi_idle_driver);
        if (result < 0)
                goto out_proc;