Browse Source

[CPUFREQ] Missing "unregister_cpu_notifier" in powernow-k8.c

It appears that when powernow-k8 finds that

    No compatible ACPI _PSS objects found.

 and suggests

    Try again with latest BIOS.

 it fails the module load, but does not unregister the cpu_notifier that was
 registered in powernowk8_init

 This ends up leaving freed memory on the cpu notifier list for some other
 poor module (e.g. md/raid5) to come along and trip over.

 The following might be a partial fix, but I suspect there is probably other
 clean-up that is needed.

 ( https://bugzilla.novell.com/show_bug.cgi?id=655215 has full dmesg traces).

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown 14 years ago
parent
commit
ac81831449
1 changed files with 8 additions and 1 deletions
  1. 8 1
      arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+ 8 - 1
arch/x86/kernel/cpu/cpufreq/powernow-k8.c

@@ -1537,6 +1537,7 @@ static struct notifier_block cpb_nb = {
 static int __cpuinit powernowk8_init(void)
 static int __cpuinit powernowk8_init(void)
 {
 {
 	unsigned int i, supported_cpus = 0, cpu;
 	unsigned int i, supported_cpus = 0, cpu;
+	int rv;
 
 
 	for_each_online_cpu(i) {
 	for_each_online_cpu(i) {
 		int rc;
 		int rc;
@@ -1574,7 +1575,13 @@ static int __cpuinit powernowk8_init(void)
 			(cpb_enabled ? "on" : "off"));
 			(cpb_enabled ? "on" : "off"));
 	}
 	}
 
 
-	return cpufreq_register_driver(&cpufreq_amd64_driver);
+	rv = cpufreq_register_driver(&cpufreq_amd64_driver);
+	if (rv < 0 && boot_cpu_has(X86_FEATURE_CPB)) {
+		unregister_cpu_notifier(&cpb_nb);
+		msrs_free(msrs);
+		msrs = NULL;
+	}
+	return rv;
 }
 }
 
 
 /* driver entry point for term */
 /* driver entry point for term */