From 83251fcca81c00388823358a36d7679049b5a980 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Fri, 22 Feb 2013 14:01:42 +0100
Subject: [PATCH] --- yaml --- r: 360875 b: refs/heads/master c:
 904464b91eca8c665acea033489225af02eeb75a h: refs/heads/master i:   360873:
 8fa8ad57f9d41d875886d47d94a6c2b7701a6db2   360871:
 28dba85d32187a6b5647ed6d26fd370db4e90307 v: v3

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

diff --git a/[refs] b/[refs]
index 386704fe18b1..0c8c5a603622 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78305c863074f809f09a96ea97b86d0f0c1c8399
+refs/heads/master: 904464b91eca8c665acea033489225af02eeb75a
diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c
index c092115d903a..3f2565037480 100644
--- a/trunk/arch/arm/kernel/smp_twd.c
+++ b/trunk/arch/arm/kernel/smp_twd.c
@@ -22,6 +22,7 @@
 #include <linux/of_irq.h>
 #include <linux/of_address.h>
 
+#include <asm/smp_plat.h>
 #include <asm/smp_twd.h>
 #include <asm/localtimer.h>
 
@@ -373,6 +374,9 @@ void __init twd_local_timer_of_register(void)
 	struct device_node *np;
 	int err;
 
+	if (!is_smp() || !setup_max_cpus)
+		return;
+
 	np = of_find_matching_node(NULL, twd_of_match);
 	if (!np)
 		return;