[S390] cio: call ccw driver notify function with lock held

[linux-2.6] / drivers / acpi / processor_perflib.c

diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index e98071a648107ccd71ad8ac81ce5753d3e67b91c..80e32093e977c6a3c5427e0746c1732a2282e017 100644 (file)
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -70,7 +70,7 @@ static DEFINE_MUTEX(performance_mutex);
  *  0 -> cpufreq low level drivers initialized -> consider _PPC values
  *  1 -> ignore _PPC totally -> forced by user through boot param
  */
-static unsigned int ignore_ppc = -1;
+static int ignore_ppc = -1;
 module_param(ignore_ppc, uint, 0644);
 MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \
                 "limited by BIOS, this should help");
@@ -95,10 +95,10 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb,
        if (ignore_ppc)
                return 0;
 
-       mutex_lock(&performance_mutex);
-
        if (event != CPUFREQ_INCOMPATIBLE)
-               goto out;
+               return 0;
+
+       mutex_lock(&performance_mutex);
 
        pr = per_cpu(processors, policy->cpu);
        if (!pr || !pr->performance)