Commit a913f507 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] powernow-k8 crash workaround

From: Andrew Morton <akpm@osdl.org>

Work around the oops reported in
http://bugzilla.kernel.org/show_bug.cgi?id=6478.

Thanks to Ralf Hildebrandt <ralf.hildebrandt@charite.de> for testing and
reporting.
Acked-by: default avatarDave Jones <davej@codemonkey.org.uk>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 670bd95e
...@@ -577,6 +577,8 @@ acpi_processor_register_performance(struct acpi_processor_performance ...@@ -577,6 +577,8 @@ acpi_processor_register_performance(struct acpi_processor_performance
return_VALUE(-EBUSY); return_VALUE(-EBUSY);
} }
WARN_ON(!performance);
pr->performance = performance; pr->performance = performance;
if (acpi_processor_get_performance_info(pr)) { if (acpi_processor_get_performance_info(pr)) {
...@@ -609,7 +611,8 @@ acpi_processor_unregister_performance(struct acpi_processor_performance ...@@ -609,7 +611,8 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
return_VOID; return_VOID;
} }
kfree(pr->performance->states); if (pr->performance)
kfree(pr->performance->states);
pr->performance = NULL; pr->performance = NULL;
acpi_cpufreq_remove_file(pr); acpi_cpufreq_remove_file(pr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment