From 3fce43792fde3f8832934960120391912264bd01 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Tue, 21 Feb 2012 10:24:22 +0100
Subject: [PATCH] --- yaml --- r: 287775 b: refs/heads/master c:
 910ba598c818243cf3de2f97e03c49948bbb0511 h: refs/heads/master i:   287773:
 e9fc574973b4d5d61a84c2dca5fd7820ff4ad88b   287771:
 eb79758e0265c9eb56a878a741ac81ffa8291103   287767:
 4aa35e5d3f059df0a0476eda484be69f31cff559   287759:
 76d44c938f509d85ff245e93cd166953a968542d   287743:
 4f58ce1bbf10f99c33a162bc9a5cbb662052a2a7 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/kernel/smp_twd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d98d8121741e..1dc67d09d6b1 100644
--- 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
index 4285daa077b0..7a79b24597b2 100644
--- 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);