aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-11 12:47:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-11 12:47:53 -0700
commitc891f2cd89c7a2b4d51d009e94c74a1e31626528 (patch)
tree51834eea173062d2c16ce2f93e17d4bd86f7e42d
parent145628130b9b364fe246e96ba52386d97af40d64 (diff)
parent50f4ddd4ff713d2599e2f246775fe2206090126e (diff)
downloadlinux-linaro-c891f2cd89c7a2b4d51d009e94c74a1e31626528.tar.gz
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] fix cpumask memory leak in acpi-cpufreq on cpu hotplug.
-rw-r--r--drivers/cpufreq/acpi-cpufreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 4e04e127438..596d5dd32f4 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -759,7 +759,7 @@ static void __exit acpi_cpufreq_exit(void)
cpufreq_unregister_driver(&acpi_cpufreq_driver);
- free_percpu(acpi_perf_data);
+ free_acpi_perf_data();
}
module_param(acpi_pstate_strict, uint, 0644);