Merge branch 'linus' into core/rcu

[pandora-kernel.git] / arch / powerpc / platforms / cell / cbe_cpufreq_pmi.c

diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c b/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
index 6a2c1b0..3233fe8 100644 (file)
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
@@ -23,7 +23,8 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/timer.h>
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
+
 #include <asm/processor.h>
 #include <asm/prom.h>
 #include <asm/pmi.h>
@@ -95,6 +96,12 @@ static int pmi_notifier(struct notifier_block *nb,
        struct cpufreq_frequency_table *cbe_freqs;
        u8 node;
 
+       /* Should this really be called for CPUFREQ_ADJUST, CPUFREQ_INCOMPATIBLE
+        * and CPUFREQ_NOTIFY policy events?)
+        */
+       if (event == CPUFREQ_START)
+               return 0;
+
        cbe_freqs = cpufreq_frequency_get_table(policy->cpu);
        node = cbe_cpu_to_node(policy->cpu);