Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: don't leave stale policy pointer in cdbs->cur_policy
  acpi-cpufreq: Add new sysfs attribute freqdomain_cpus
  cpufreq: make sure frequency transitions are serialized

diff --combined drivers/cpufreq/acpi-cpufreq.c
index f4fef0acc1838e6505d3ccf8f29dc73977ce2ece,403dad646abe6169a3c07244120eafa52fb117f3..39264020b88a1b2e7d461a8d0a3f2f909a31dbb4
--- 1/drivers/cpufreq/acpi-cpufreq.c
--- 2/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@@ -70,6 -70,7 +70,7 @@@ struct acpi_cpufreq_data 
        struct cpufreq_frequency_table *freq_table;
        unsigned int resume;
        unsigned int cpu_feature;
+       cpumask_var_t freqdomain_cpus;
  };
  
  static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
@@@ -176,6 -177,15 +177,15 @@@ static struct global_attr global_boost 
                                                show_global_boost,
                                                store_global_boost);
  
+ static ssize_t show_freqdomain_cpus(struct cpufreq_policy *policy, char *buf)
+ {
+       struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
+ 
+       return cpufreq_show_cpus(data->freqdomain_cpus, buf);
+ }
+ 
+ cpufreq_freq_attr_ro(freqdomain_cpus);
+ 
  #ifdef CONFIG_X86_ACPI_CPUFREQ_CPB
  static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf,
                         size_t count)
@@@ -704,6 -714,11 +714,11 @@@ static int acpi_cpufreq_cpu_init(struc
        if (!data)
                return -ENOMEM;
  
+       if (!zalloc_cpumask_var(&data->freqdomain_cpus, GFP_KERNEL)) {
+               result = -ENOMEM;
+               goto err_free;
+       }
+ 
        data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
        per_cpu(acfreq_data, cpu) = data;
  
@@@ -712,7 -727,7 +727,7 @@@
  
        result = acpi_processor_register_performance(data->acpi_data, cpu);
        if (result)
-               goto err_free;
+               goto err_free_mask;
  
        perf = data->acpi_data;
        policy->shared_type = perf->shared_type;
@@@ -725,6 -740,7 +740,7 @@@
            policy->shared_type == CPUFREQ_SHARED_TYPE_ANY) {
                cpumask_copy(policy->cpus, perf->shared_cpu_map);
        }
+       cpumask_copy(data->freqdomain_cpus, perf->shared_cpu_map);
  
  #ifdef CONFIG_SMP
        dmi_check_system(sw_any_bug_dmi_table);
@@@ -736,6 -752,7 +752,7 @@@
        if (check_amd_hwpstate_cpu(cpu) && !acpi_pstate_strict) {
                cpumask_clear(policy->cpus);
                cpumask_set_cpu(cpu, policy->cpus);
+               cpumask_copy(data->freqdomain_cpus, cpu_sibling_mask(cpu));
                policy->shared_type = CPUFREQ_SHARED_TYPE_HW;
                pr_info_once(PFX "overriding BIOS provided _PSD data\n");
        }
@@@ -870,6 -887,8 +887,8 @@@ err_freqfree
        kfree(data->freq_table);
  err_unreg:
        acpi_processor_unregister_performance(perf, cpu);
+ err_free_mask:
+       free_cpumask_var(data->freqdomain_cpus);
  err_free:
        kfree(data);
        per_cpu(acfreq_data, cpu) = NULL;
@@@ -888,6 -907,7 +907,7 @@@ static int acpi_cpufreq_cpu_exit(struc
                per_cpu(acfreq_data, policy->cpu) = NULL;
                acpi_processor_unregister_performance(data->acpi_data,
                                                      policy->cpu);
+               free_cpumask_var(data->freqdomain_cpus);
                kfree(data->freq_table);
                kfree(data);
        }
@@@ -908,6 -928,7 +928,7 @@@ static int acpi_cpufreq_resume(struct c
  
  static struct freq_attr *acpi_cpufreq_attr[] = {
        &cpufreq_freq_attr_scaling_available_freqs,
+       &freqdomain_cpus,
        NULL,   /* this is a placeholder for cpb, do not remove */
        NULL,
  };
@@@ -1036,11 -1057,4 +1057,11 @@@ static const struct x86_cpu_id acpi_cpu
  };
  MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);
  
 +static const struct acpi_device_id processor_device_ids[] = {
 +      {ACPI_PROCESSOR_OBJECT_HID, },
 +      {ACPI_PROCESSOR_DEVICE_HID, },
 +      {},
 +};
 +MODULE_DEVICE_TABLE(acpi, processor_device_ids);
 +
  MODULE_ALIAS("acpi");