---

yaml --- r: 360875 b: refs/heads/master c: 904464b h: refs/heads/master i: 360873: 8fa8ad5 360871: 28dba85 v: v3
git-mirror · Mar 3, 2013 · 83251fc · 83251fc
1 parent 42b4772
commit 83251fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;