diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-28 17:21:32 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-28 17:21:32 +0200 |
| commit | c6e53c69ef463ba2749ba9ee9b3d9d7f97dab94a (patch) | |
| tree | b6d4a3baadec8d95dc98edf70ee49d7b44f4cc7a /drivers/xen/xen-acpi-processor.c | |
| parent | 559ed40752dc63e68f9b9ad301b20e6a3fe5cf21 (diff) | |
| parent | 454d3a2500a4eb33be85dde3bfba9e5f6b5efadc (diff) | |
Merge back earlier cpufreq material for v4.3.
Diffstat (limited to 'drivers/xen/xen-acpi-processor.c')
| -rw-r--r-- | drivers/xen/xen-acpi-processor.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c index 59fc190f1e92..70fa438000af 100644 --- a/drivers/xen/xen-acpi-processor.c +++ b/drivers/xen/xen-acpi-processor.c @@ -560,11 +560,9 @@ static int __init xen_acpi_processor_init(void) return 0; err_unregister: - for_each_possible_cpu(i) { - struct acpi_processor_performance *perf; - perf = per_cpu_ptr(acpi_perf_data, i); - acpi_processor_unregister_performance(perf, i); - } + for_each_possible_cpu(i) + acpi_processor_unregister_performance(i); + err_out: /* Freeing a NULL pointer is OK: alloc_percpu zeroes. */ free_acpi_perf_data(); @@ -579,11 +577,9 @@ static void __exit xen_acpi_processor_exit(void) kfree(acpi_ids_done); kfree(acpi_id_present); kfree(acpi_id_cst_present); - for_each_possible_cpu(i) { - struct acpi_processor_performance *perf; - perf = per_cpu_ptr(acpi_perf_data, i); - acpi_processor_unregister_performance(perf, i); - } + for_each_possible_cpu(i) + acpi_processor_unregister_performance(i); + free_acpi_perf_data(); } |