Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
Linus Torvalds [Sun, 7 Mar 2010 20:52:38 +0000 (12:52 -0800)]
* '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

1  2 
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