Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: ppc: Remove duplicate inclusion of fsl_soc.h
  cpufreq: create another field .flags in cpufreq_frequency_table
  cpufreq: use kzalloc() to allocate memory for cpufreq_frequency_table
  cpufreq: don't print value of .driver_data from core
  cpufreq: ia64: don't set .driver_data to index
  cpufreq: powernv: Select CPUFreq related Kconfig options for powernv
  cpufreq: powernv: Use cpufreq_frequency_table.driver_data to store pstate ids
  cpufreq: powernv: cpufreq driver for powernv platform
  cpufreq: at32ap: don't declare local variable as static
  cpufreq: loongson2_cpufreq: don't declare local variable as static
  cpufreq: unicore32: fix typo issue for 'clk'
  cpufreq: exynos: Disable on multiplatform build

diff --combined arch/powerpc/include/asm/reg.h
index 0dcc48af25a302759a5c0aca3f46b5abd7fb2507,2189f8f2ca88e3f6d37f75ce3a75bc38736cb70d..e5d2e0bc7e032b64890701cdc91d88e18cd665c6
--- 1/arch/powerpc/include/asm/reg.h
--- 2/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@@ -213,7 -213,6 +213,7 @@@
  #define SPRN_ACOP     0x1F    /* Available Coprocessor Register */
  #define SPRN_TFIAR    0x81    /* Transaction Failure Inst Addr   */
  #define SPRN_TEXASR   0x82    /* Transaction EXception & Summary */
 +#define   TEXASR_FS   __MASK(63-36)   /* Transaction Failure Summary */
  #define SPRN_TEXASRU  0x83    /* ''      ''      ''    Upper 32  */
  #define SPRN_TFHAR    0x80    /* Transaction Failure Handler Addr */
  #define SPRN_CTRLF    0x088
@@@ -272,6 -271,10 +272,10 @@@
  #define SPRN_HSRR1    0x13B   /* Hypervisor Save/Restore 1 */
  #define SPRN_IC               0x350   /* Virtual Instruction Count */
  #define SPRN_VTB      0x351   /* Virtual Time Base */
+ #define SPRN_PMICR    0x354   /* Power Management Idle Control Reg */
+ #define SPRN_PMSR     0x355   /* Power Management Status Reg */
+ #define SPRN_PMCR     0x374   /* Power Management Control Register */
+ 
  /* HFSCR and FSCR bit numbers are the same */
  #define FSCR_TAR_LG   8       /* Enable Target Address Register */
  #define FSCR_EBB_LG   7       /* Enable Event Based Branching */

diff --combined drivers/cpufreq/Kconfig.arm
index 1e2b9db563ec1ac74b39516a9438fc360cf658fa,33526ed8b9d4104b33b4fc94ee41e2ff41b388b8..0e9cce82844bf519f62b7bed24bf0783d89400e9
--- 1/drivers/cpufreq/Kconfig.arm
--- 2/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@@ -30,7 -30,7 +30,7 @@@ config ARM_EXYNOS_CPUFRE
  
  config ARM_EXYNOS4210_CPUFREQ
        bool "SAMSUNG EXYNOS4210"
-       depends on CPU_EXYNOS4210
+       depends on CPU_EXYNOS4210 && !ARCH_MULTIPLATFORM
        default y
        select ARM_EXYNOS_CPUFREQ
        help
@@@ -41,7 -41,7 +41,7 @@@
  
  config ARM_EXYNOS4X12_CPUFREQ
        bool "SAMSUNG EXYNOS4x12"
-       depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412)
+       depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM
        default y
        select ARM_EXYNOS_CPUFREQ
        help
@@@ -52,7 -52,7 +52,7 @@@
  
  config ARM_EXYNOS5250_CPUFREQ
        bool "SAMSUNG EXYNOS5250"
-       depends on SOC_EXYNOS5250
+       depends on SOC_EXYNOS5250 && !ARCH_MULTIPLATFORM
        default y
        select ARM_EXYNOS_CPUFREQ
        help
@@@ -122,7 -122,7 +122,7 @@@ config ARM_INTEGRATO
          If in doubt, say Y.
  
  config ARM_KIRKWOOD_CPUFREQ
 -      def_bool ARCH_KIRKWOOD && OF
 +      def_bool MACH_KIRKWOOD
        help
          This adds the CPUFreq driver for Marvell Kirkwood
          SoCs.

diff --combined drivers/cpufreq/acpi-cpufreq.c
index d5eaedbe464f873e5a32978ac6cf86eb70169188,c91ef5785dfa3081533a140617be0454a27f1d12..000e4e0afd7e672abaac488d3096ae199f68a301
--- 1/drivers/cpufreq/acpi-cpufreq.c
--- 2/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@@ -754,7 -754,7 +754,7 @@@ static int acpi_cpufreq_cpu_init(struc
                goto err_unreg;
        }
  
-       data->freq_table = kmalloc(sizeof(*data->freq_table) *
+       data->freq_table = kzalloc(sizeof(*data->freq_table) *
                    (perf->state_count+1), GFP_KERNEL);
        if (!data->freq_table) {
                result = -ENOMEM;
@@@ -906,16 -906,15 +906,16 @@@ static void __init acpi_cpufreq_boost_i
  
                acpi_cpufreq_driver.boost_supported = true;
                acpi_cpufreq_driver.boost_enabled = boost_state(0);
 -              get_online_cpus();
 +
 +              cpu_notifier_register_begin();
  
                /* Force all MSRs to the same value */
                boost_set_msrs(acpi_cpufreq_driver.boost_enabled,
                               cpu_online_mask);
  
 -              register_cpu_notifier(&boost_nb);
 +              __register_cpu_notifier(&boost_nb);
  
 -              put_online_cpus();
 +              cpu_notifier_register_done();
        }
  }