From c7470311a283367386c7b90f6e8b111d3da20a76 Mon Sep 17 00:00:00 2001
From: Jean-Christophe DUBOIS <jcd@tribudubois.net>
Date: Fri, 20 Jul 2007 21:39:23 +0200
Subject: [PATCH] --- yaml --- r: 62232 b: refs/heads/master c:
 64bafa9db7e92d5a46402613188b71800924ca1f h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 trunk/arch/powerpc/platforms/cell/cbe_cpufreq.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e429674fc95d..3ee9bff1e322 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74889e41d9a1f80928130a02af9b010673bc5ba7
+refs/heads/master: 64bafa9db7e92d5a46402613188b71800924ca1f
diff --git a/trunk/arch/powerpc/platforms/cell/cbe_cpufreq.c b/trunk/arch/powerpc/platforms/cell/cbe_cpufreq.c
index 9a9932624c0c..0b6e8ee85ab1 100644
--- a/trunk/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/trunk/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -24,6 +24,7 @@
 #include <asm/machdep.h>
 #include <asm/of_platform.h>
 #include <asm/prom.h>
+#include "cbe_regs.h"
 #include "cbe_cpufreq.h"
 
 static DEFINE_MUTEX(cbe_switch_mutex);
@@ -78,6 +79,15 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
 	pr_debug("init cpufreq on CPU %d\n", policy->cpu);
 
+	/*
+	 * Let's check we can actually get to the CELL regs
+	 */
+	if (!cbe_get_cpu_pmd_regs(policy->cpu) ||
+	    !cbe_get_cpu_mic_tm_regs(policy->cpu)) {
+		pr_info("invalid CBE regs pointers for cpufreq\n");
+		return -EINVAL;
+	}
+
 	max_freqp = of_get_property(cpu, "clock-frequency", NULL);
 
 	of_node_put(cpu);