From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Mar 2010 20:52:38 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=08b8499bdd26822df16f962db88215d02e40850a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'next' of git://git./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
---

08b8499bdd26822df16f962db88215d02e40850a
diff --cc drivers/acpi/processor_core.c
index 9863c98c81ba,7fe413cc7d99..e9b7b402dbfb
--- a/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