---

yaml --- r: 287775 b: refs/heads/master c: 910ba59 h: refs/heads/master i: 287773: e9fc574 287771: eb79758 287767: 4aa35e5 287759: 76d44c9 287743: 4f58ce1 v: v3
git-mirror · Feb 21, 2012 · 3fce437 · 3fce437
1 parent 4705247
commit 3fce437
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fee6a3c33a8f137f39cd9997b0476411f73576c7
+refs/heads/master: 910ba598c818243cf3de2f97e03c49948bbb0511
diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c
@@ -129,7 +129,7 @@ static struct notifier_block twd_cpufreq_nb = {
 
 static int twd_cpufreq_init(void)
 {
-	if (!IS_ERR(twd_clk))
+	if (twd_evt && *__this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
 		return cpufreq_register_notifier(&twd_cpufreq_nb,
 			CPUFREQ_TRANSITION_NOTIFIER);